Fri Dec 04 2020 13:42:22 GMT+0000 (UTC)

2020-12-04 13:42:22 +00:00 · 2020-12-04 13:42:22 +00:00 · 34ed3fa57d
parent fb68998419
commit 34ed3fa57d
1 changed files with 1 additions and 5 deletions
--- a/01/01.txt
+++ b/01/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 2 \v 3 test text
-=======
-\v 3 \v 1 Here is some example text. \v 2 It is not a translation. Here is some more text. another test from Android 10 and another
->>>>>>> 48f6c818d2f112b3caeba46d111a0d6bca2e43f1
+\c 1 \v 1 \v 2 \v 3 test text