diff --git a/README.md b/README.md index 2e16687fe4df004dce401891041deca372ff708f..7116256d983edfed6b86954e00a1edc5f4bbc9cc 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 =======