SHA1
--- a/test.md
+++ b/test.md
@@ -1,3 +1,7 @@
 
				 # test1
			
 
				+<<<<<<< HEAD
			
 
				+# test3
			
 
				+=======
			
 
				 
			
 
				 # test2
			
 
				+>>>>>>> 96de58a09ef476f2db8eeeea432b059d103fde77
Author	SHA1 Message	Date
Gareth	d6d9de77cc Merge branch 'master' of http://192.168.0.173:3000/test_group/test_v7	2 years ago
Gareth	2f2a8208df test3	2 years ago