Fix conflicts on despacito.txt

2024-10-22 09:41:13 +04:00
parent bca391148d 661b672cd6
commit 7c039664df
3 changed files with 4 additions and 3 deletions
@@ -0,0 +1 @@
+AHAHAHHAHA GOTAGAAAAAAA
@@ -1,6 +1,5 @@
-Salut Salut !
-
-[Letra de "Despacito" ft. Daddy Yankee] 
+la musica
+[Letra de "Despacito" ft. Daddy Yankee]

 [Intro: Luis Fonsi & Daddy Yankee]
 Ay, ¡Fonsi! ¡DY!
@@ -0,0 +1 @@
+c'est pas moi :)