diff --git a/README.md b/README.md index 072cbf354ebb4c0820379680c6b896e2fb79d8c0..239868df3a6863b6a2e64b87b286cadb566d8057 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ test-project - I edited in web * SSH - 12:19 - A -### I am in the branch 0510 - +### I am in the branch 0510 *** * Hello + <<<<<<< HEAD * edit in 0510 =======