diff --git a/src/test.txt b/src/test.txt index 9186d11d..eeaba850 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -rm log +Merge branch 'zouap' of https \ No newline at end of file