Fixed conflicts
authorRemixDev <deezloaderremix@gmail.com>
Wed, 6 Mar 2019 16:38:37 +0000 (17:38 +0100)
committerRemixDev <deezloaderremix@gmail.com>
Wed, 6 Mar 2019 16:38:37 +0000 (17:38 +0100)
app/package-lock.json
app/package.json
app/public/index.html

index 6c3f482f2152ef9cff284444fc8eb1d361fafb5d..ba98819411e8566048ce7b437154d98ac4a8ba7d 100644 (file)
@@ -1,10 +1,6 @@
 {
        "name": "deezloader-rmx",
-<<<<<<< HEAD
-       "version": "4.1.8",
-=======
        "version": "4.2.0",
->>>>>>> rewrite
        "lockfileVersion": 1,
        "requires": true,
        "dependencies": {
index abe265ba049a3b0935cab9b065dad37c451d6039..daadea435fe38eab433039493ae9bc3d9c77eb6e 100644 (file)
@@ -1,11 +1,7 @@
 {
        "name": "deezloader-rmx",
        "productName": "Deezloader Remix",
-<<<<<<< HEAD
-       "version": "4.1.8",
-=======
        "version": "4.2.0",
->>>>>>> rewrite
        "description": "Download music from Deezer",
        "main": "main.js",
        "author": "RemixDevs",
index 4193e8dfbb35099d4e4d8d12e417a4032587713a..4a474fb9c31012088c867501f0af179130344424 100644 (file)
   <meta charset="utf-8"/>
 </head>
 <body>
-<<<<<<< HEAD
-<span id="appVersionFallback" hidden>4.1.8</span>
-=======
 <span id="appVersionFallback" hidden>4.2.0</span>
->>>>>>> rewrite
 
 <div id="title-bar" class="deezloader-black">
        <div class="resize-padding" style="width: 100%; height: 3px;"></div>