resolve chongtu

1 月之前 · f654a44c28
--- a/fenzhi1.txt
+++ b/fenzhi1.txt
@@ -0,0 +1 @@
 this is fenzhi1
--- a/fenzhi2.txt
+++ b/fenzhi2.txt
@@ -0,0 +1 @@
 this is fenzhu2
--- a/fenzhi3.txt
+++ b/fenzhi3.txt
@@ -0,0 +1 @@
 this is fenzhi3
--- a/+ 1
+++ b/+ 1
@@ -0,0 +1 @@
 this is laqu 
--- a/readme.txt
+++ b/readme.txt
@@ -1 +1,2 @@
 this is a source_test from master
 <<<<<<< HEAD
 this is a source_test from master