revert test2

Change-Id: I515250018ec47b6724dbbbbed40a7af599800a85
2020-04-07 11:16:01 +08:00
parent fe40adc208
commit 97afb67b6f
1 changed files with 1 additions and 0 deletions
--- a/conflict-test.txt
+++ b/conflict-test.txt
@@ -1,5 +1,6 @@
 this is the first line.
 this is the second line.
+ooo
 this is the third line.
 this is the forth line!@#
 this is my first line