clash
/
wyy_php_text_reg
1
0
Fork 0
Files Issues Pull Requests Packages Projects Releases Wiki Activity See in Reader

fixed merge conflcit

This commit is contained in:
Chuck Liesch 2024-04-25 08:45:22 -05:00
parent d4d4c4229b
commit ab1c1fb1ca
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
03/title.txt
View File

@ -1 +0,0 @@
Wase 3

5
manifest.json
View File

@ -1,5 +1,2 @@
<<<<<<< HEAD
{"project":{"id":"php","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Western Fijian","direction":"ltr","anglicized_name":"Fijian, Western","region":"Pacific","is_gateway_language":false,"id":"wyy"},"format":"usfm","resource":{"id":"reg"},"translators":["wayan dialect"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["02-title","02-01","02-03","02-05","02-09","02-12","02-14","02-17","02-19","02-22","02-25","02-28","03-title"]}
=======
{"project":{"id":"php","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Western Fijian","direction":"ltr","anglicized_name":"Fijian, Western","region":"Pacific","is_gateway_language":false,"id":"wyy"},"format":"usfm","resource":{"id":"reg"},"translators":["wayan dialect"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["02-title","02-01","02-03","02-05","02-09","02-12","02-14","02-17","02-19","02-22","02-25"]}
>>>>>>> parent of ed3ecdb (auto save)
wq