2020-12-04 13:42:05 +00:00
|
|
|
<<<<<<< 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
|