SHA1
--- a/fun.c
+++ b/fun.c
@@ -1,3 +1,7 @@
 
				 sdfsdfsdfsdfs
			
 
				 111111111111
			
 
				-2222222222222222
			
 
				+<<<<<<< HEAD
			
 
				+999999999999999999
			
 
				+=======
			
 
				+2222222222222222
			
 
				+>>>>>>> c72c21be9f8c7c17cad2df85e2549d96e88c89b8
Author	SHA1 Message	Date
zecak	13dab6e6af Squashed commit of the following:	1 week ago
zecak	4b8da5205f 11	1 week ago