diff --git a/hello.txt b/hello.txt index 3d32ae56a789c04c7d918b507e07494490ff5ea2..993d200fcb57edff96f3d662062e84bcc3d6305d 100644 --- a/hello.txt +++ b/hello.txt @@ -1,4 +1,4 @@ -hello world +difdodfhfhello world <<<<<<< HEAD in git =======