1 week ago · a336b5d9f7
--- a/fun.c
+++ b/fun.c
@@ -1,7 +1,4 @@
 
				 sdfsdfsdfsdfs
			
 
				 111111111111
			
 
				-<<<<<<< HEAD
			
 
				 999999999999999999
			
 
				-=======
			
 
				 2222222222222222
			
 
				->>>>>>> c72c21be9f8c7c17cad2df85e2549d96e88c89b8