diff --git a/hello.txt b/hello.txt index 3d32ae56a789c04c7d918b507e07494490ff5ea2..826dd921ea6fc74782036637c6cac20754c3ce05 100644 --- a/hello.txt +++ b/hello.txt @@ -1,4 +1,4 @@ -hello world +dfdfdfdffdhello world <<<<<<< HEAD in git =======