diff --git a/src/test.txt b/src/test.txt index a00af07a..e29df0ba 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -merge +fix-bug