diff --git a/hello.txt b/hello.txt index 8c888890f1c80d290b11ed1425d4aaefb32c5081..3d32ae56a789c04c7d918b507e07494490ff5ea2 100644 --- a/hello.txt +++ b/hello.txt @@ -1,7 +1,4 @@ -difdodfhpiweognroibnikenladnb -asfdobpdbndlkbnb -OBNDFAKLBF -FSBSFKLBNFBfhello world +hello world <<<<<<< HEAD in git =======