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

This commit is contained in:
craig 2020-12-04 13:42:05 +00:00
commit fb68998419
3 changed files with 13 additions and 1 deletions

View File

@ -1 +1,5 @@
\c 1 \v 1 \v 2 \v 3 test text
<<<<<<< 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

1
01/04.txt Normal file
View File

@ -0,0 +1 @@
\v 4 Here is \v 5 some more \v 6 sample text.

View File

@ -2,7 +2,11 @@
# License
## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
<<<<<<< HEAD
This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
=======
This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
>>>>>>> 48f6c818d2f112b3caeba46d111a0d6bca2e43f1
### You are free to:
@ -25,5 +29,8 @@ The licensor cannot revoke these freedoms as long as you follow the license term
You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
<<<<<<< HEAD
This PDF was generated using Prince (https://www.princexml.com/).
=======
>>>>>>> 48f6c818d2f112b3caeba46d111a0d6bca2e43f1