diff --git a/hello.txt b/hello.txt index e376708646be5db243f01b8fd20d50b01129f937..d73d74e067b112c13d67307c5a9b8869c49008a5 100644 --- a/hello.txt +++ b/hello.txt @@ -1,2 +1,6 @@ hello world +<<<<<<< HEAD in git +======= +web +>>>>>>> 53ed6f61209f7d77b77b3d2df0704090117fcc3b