Merge branch 'rewrite'
authorRemixDev <deezloaderremix@gmail.com>
Wed, 6 Mar 2019 16:33:21 +0000 (17:33 +0100)
committerRemixDev <deezloaderremix@gmail.com>
Wed, 6 Mar 2019 16:33:21 +0000 (17:33 +0100)
1  2 
app/package-lock.json
app/package.json
app/public/index.html

index 4a4e089b94b28b76a6635009960b4ba4327388da,ba98819411e8566048ce7b437154d98ac4a8ba7d..6c3f482f2152ef9cff284444fc8eb1d361fafb5d
@@@ -1,6 -1,6 +1,10 @@@
  {
        "name": "deezloader-rmx",
++<<<<<<< HEAD
 +      "version": "4.1.8",
++=======
+       "version": "4.2.0",
++>>>>>>> rewrite
        "lockfileVersion": 1,
        "requires": true,
        "dependencies": {
index b765c7f96a31a82570c7cc91b50c7d63cdb42f74,daadea435fe38eab433039493ae9bc3d9c77eb6e..abe265ba049a3b0935cab9b065dad37c451d6039
@@@ -1,7 -1,7 +1,11 @@@
  {
        "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 27a8e0a96e6bb8e2425acedb635194f4c3f88816,44a106350b1ad462410c6208542202ec766e3921..4193e8dfbb35099d4e4d8d12e417a4032587713a
    <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>