Sat Mar 07 2020 16:28:41 GMT+0300 (E. Africa Standard Time)

01/04.txt

@@ -0,0 +1 @@
+Rama

LICENSE.md

@@ -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/).
+>>>>>>> 256b8d98cccce2a7fd53721cfe6c899d89c15800
 
 ### 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/).
+=======
+>>>>>>> 256b8d98cccce2a7fd53721cfe6c899d89c15800

manifest.json

@@ -32,6 +32,8 @@
 		}
 	],
 	"parent_draft": {},
-	"translators": [],
+	"translators": [
+		"MAD122"
+	],
 	"finished_chunks": []
 }