From ab1c1fb1ca8c128aac88ffc0b410c9e07454ff7f Mon Sep 17 00:00:00 2001 From: clash Date: Thu, 25 Apr 2024 08:45:22 -0500 Subject: [PATCH] fixed merge conflcit --- 03/title.txt | 1 - manifest.json | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 03/title.txt diff --git a/03/title.txt b/03/title.txt deleted file mode 100644 index e2d9f1e..0000000 --- a/03/title.txt +++ /dev/null @@ -1 +0,0 @@ -Wase 3 \ No newline at end of file diff --git a/manifest.json b/manifest.json index fa4e380..1bc8107 100644 --- a/manifest.json +++ b/manifest.json @@ -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