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

01/06.txt

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

LICENSE.md

@@ -2,6 +2,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # License
 ## 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
 =======
 >>>>>>> 7116aea053638a2915e3dd15504d43d68d3c6162
+=======
+>>>>>>> bb88b8114f87de5de4da6feda6e281714da1abac
 ## Creative Commons Attribution-ShareAlike 4.0 International
 
 ### Human-Readable Summary 
@@ -70,6 +73,7 @@ http://creativecommons.org/licenses/by-sa/4.0/.
 
   
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 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/).
 >>>>>>> 7116aea053638a2915e3dd15504d43d68d3c6162
+=======
+This PDF was generated using Prince (https://www.princexml.com/).
+>>>>>>> bb88b8114f87de5de4da6feda6e281714da1abac

manifest.json

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