Merge branch 'master' of http://192.168.0.173:3000/test_group/test_v7

test.md

@@ -1,2 +1,7 @@
 # test1
-# test3
+<<<<<<< HEAD
+# test3
+=======
+
+# test2
+>>>>>>> 96de58a09ef476f2db8eeeea432b059d103fde77