3 luni în urmă · 61789f110b
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 
				 Hello world !!!!!!
			
 
				-Hellooooooo Magali
			
 
				+Hellooooooo Lakshmi !!
			
--- a/youpi.txt
+++ b/youpi.txt
@@ -1,5 +1 @@
 
				-<<<<<<< HEAD
			
 
				 Bonjour ;)
			
 
				-=======
			
 
				-PILOU PILOU PILOU
			
 
				->>>>>>> 557544e59e118f98eb6b81f79518020338620c58