changed fonts, prettified assets & changed some styles

tuhinpal · Sep 5, 2020 · 78063b2 · 78063b2
1 parent 6d7c59f
commit 78063b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/play/assets/main.js b/play/assets/main.js
@@ -54,12 +54,4 @@ getJSON('https://api.musicder.tk/?query=https://www.jiosaavn.com/song/' + songid
 /*!
  * Made by Tuhin Kanti Pal
  * Visit https://tu.hin.life
-<<<<<<< Updated upstream
- */
-=======
-<<<<<<< HEAD
- */
-=======
- */
->>>>>>> 4eff1e5f15e67ace2b3e80624a56c2f8e653058c
->>>>>>> Stashed changes
+ */
diff --git a/play/index.html b/play/index.html
@@ -5,14 +5,7 @@
       <meta name="viewport" content="width=device-width, initial-scale=1" />
       <meta http-equiv="X-UA-Compatible" content="IE=edge" />
       <meta name="author" content="Tuhin Kanti Pal">
-<<<<<<< HEAD
       <link href="https://fonts.googleapis.com/css?family=Krona+One|Catamaran" rel="stylesheet" />
-=======
-      <link href="https://fonts.googleapis.com/css?family=Krona+One" rel="stylesheet" />
-<<<<<<< Updated upstream
-=======
->>>>>>> 4eff1e5f15e67ace2b3e80624a56c2f8e653058c
->>>>>>> Stashed changes
       <link rel="shortcut icon" href="../img/favicon.png">
       <link href="assets/style.css" rel="stylesheet" />
    </head>
@@ -44,4 +37,4 @@ <h1 id="songname" class="songname"></h1>
    </body>
    <script src="assets/main.js"></script>
 </html>
-<!Made by Tuhin. Send Mail to me[at]mailtuhin[dot]ml for contact.>
+<!Made by Tuhin. Send Mail to me[at]mailtuhin[dot]ml for contact.>