gr

3 years ago · 8828faa68d
parent f2568b988b cb34d61f58
commit 8828faa68d
1 changed files with 14 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,17 @@
+<<<<<<< HEAD
 This is incredible, welcome welcome to REAMME.md by Gerry 
 grrrrrrgr
 uahah
+=======
+<<<<<<< HEAD
+This is incredible, welcome welcome to REAmmmmmMME.md by Gerry 
+I don't like it by Mitsa
+=======
+This is incredible, welcome welcome to REAMME.md by Gerry
+
+
+
+
+Eheheh 🦦
+>>>>>>> c6419049d3838ec0f83d9aaece1da811df3bfb77
+>>>>>>> cb34d61f58e6da0a03e8acd462adf5bc9e2fd9d3