3 months ago · ea2332db26
--- a/youpi.txt
+++ b/youpi.txt
@@ -1,2 +1,6 @@
 
				+<<<<<<< HEAD
			
 
				 Coucou ezfzedfz
			
 
				 
			
 
				+=======
			
 
				+PILOU PILOU PILOU
			
 
				+>>>>>>> 017012fa7924fd446590d0287463fc59bf1b2255