Merge branch 'master' into test

BaranDev · Aug 31, 2023 · eee5344 · eee5344
2 parents 99b6b2e + 110d230
commit eee5344
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 **Instructions:**
 
 
@@ -40,5 +39,4 @@ The Spicetify Updater CLI provides a convenient way to update Spicetify and its
 **Credits:**
 
 - ASCII Art: [https://user.xmission.com/~emailbox](https://user.xmission.com/~emailbox)
-- Music: Pokemon Emerald - Littleroot Town *(played by me!)*
->>>>>>> c38d1333b17b2294753a3a12dd98636c67d3892b
+- Music: Pokemon Emerald - Littleroot Town *(played by me!)*