diff --git a/src/test.txt b/src/test.txt index 784265fe..546fd27c 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -conflict fix +Revert "tmp"