clash
/
icl_rut_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Tue Mar 01 2022 01:33:08 GMT-0600 (Central Standard Time)

This commit is contained in:
chuck 2022-03-01 01:33:08 -06:00
parent 800719369d bb88b8114f
commit 501c84abf3
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
01/06.txt
View File

@ -1 +1,6 @@
<<<<<<< HEAD
\v 6 This is a \v 7 merge conflict. \v 6 This is a \v 7 merge conflict.
=======
\v 6 Спасибо за терпение и ожидание меня, вы крутые!!!!
\v 7 Я очень ожидаю полной победы в каждой нашей борьбе. Спасибо за единство
>>>>>>> bb88b8114f87de5de4da6feda6e281714da1abac

7
LICENSE.md
View File

@ -2,6 +2,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
# License # License
## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@ -33,6 +34,8 @@ No warranties are given. The license may not give you all of the permissions nec
>>>>>>> fbd5bc592da14dc018deff329b4115efe00738ee >>>>>>> fbd5bc592da14dc018deff329b4115efe00738ee
======= =======
>>>>>>> 7116aea053638a2915e3dd15504d43d68d3c6162 >>>>>>> 7116aea053638a2915e3dd15504d43d68d3c6162
=======
>>>>>>> bb88b8114f87de5de4da6feda6e281714da1abac
## Creative Commons Attribution-ShareAlike 4.0 International ## Creative Commons Attribution-ShareAlike 4.0 International
### Human-Readable Summary ### Human-Readable Summary
@ -70,6 +73,7 @@ http://creativecommons.org/licenses/by-sa/4.0/.
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
This PDF was generated using Prince (https://www.princexml.com/). This PDF was generated using Prince (https://www.princexml.com/).
@ -80,3 +84,6 @@ This PDF was generated using Prince (https://www.princexml.com/).
======= =======
This PDF was generated using Prince (https://www.princexml.com/). This PDF was generated using Prince (https://www.princexml.com/).
>>>>>>> 7116aea053638a2915e3dd15504d43d68d3c6162 >>>>>>> 7116aea053638a2915e3dd15504d43d68d3c6162
=======
This PDF was generated using Prince (https://www.princexml.com/).
>>>>>>> bb88b8114f87de5de4da6feda6e281714da1abac

3
manifest.json
View File

@ -28,7 +28,8 @@
"Parvina_rakhimova", "Parvina_rakhimova",
"Salmoon Riaz", "Salmoon Riaz",
"chuck", "chuck",
"Anton Chinkov" "Anton Chinkov",
"Larisa_m"
], ],
"source_translations": [ "source_translations": [
{ {