Skip to content

Commit aaed35b

Browse files
elbobyhnelbobyhn
committed
hola mundo2
2 parents 201ef4a + 0a2339c commit aaed35b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎holamundo.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
<<<<<<< HEAD
12
Holamundo.txt creado en local
3+
=======
4+
Texto en github
5+
>>>>>>> origin/master

0 commit comments

Comments
 (0)