From d718f7ed6f1decf391161c91e340459ef853af6c Mon Sep 17 00:00:00 2001
From: dayaksalako <dayaksalako210@gmail.com>
Date: Fri, 1 Jul 2022 15:35:51 +0700
Subject: [PATCH] Fri Jul 01 2022 15:35:49 GMT+0700 (SE Asia Standard Time)

---
 01/20.txt       | 16 +---------------
 front/title.txt |  6 +-----
 manifest.json   |  9 +++++----
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/01/20.txt b/01/20.txt
index a82f9303..3d4a0178 100644
--- a/01/20.txt
+++ b/01/20.txt
@@ -1,17 +1,3 @@
-<<<<<<< HEAD
 \v 20 Sabab udoh tatulis ka kitap Mazmur:
   ' Mae jare tampat diop'e jadi sunyi,  mae jare ano seko  nang diop kako'o,'
-Mazmur 69:26 lantas,  'Mae jare nang lain'ne ngicok' jabatan'ne.' Mazmur 109:8
-=======
-\v 20 Karamo, udoh tatulis ka kitap Mazmur:                         
-     
-  'Biarot tampat diop'e jadi sunyi,                                        
-      ba biarot ka naun ano 
-seko nyaudoh nang diop ka  doop'pe
-Mazmur 69:26 
-
-Ba,                                    
-
-   'Biarot nang lain'ne ngicok' jabatan'ne ( jabatan   yudas ).'
-Mazmur 109:8
->>>>>>> cdb8e60d2d1df4681ccdfce488aca34ba1208d61
+Mazmur 69:26 lantas,  'Mae jare nang lain'ne ngicok' jabatan'ne.' Mazmur 109:8
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index e44a2314..0de1821d 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Rasul Para
-=======
-Para Rasul
->>>>>>> cdb8e60d2d1df4681ccdfce488aca34ba1208d61
+Para Rasul
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 136c38b9..d06e2b01 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": "132"
+		"build": "5"
 	},
 	"target_language": {
 		"name": "Dayak Salako",
@@ -29,8 +29,8 @@
 			"language_id": "id",
 			"resource_id": "ayt",
 			"checking_level": "3",
-			"date_modified": "2018-01-08T00:00:00+00:00",
-			"version": "2016"
+			"date_modified": "2020-06-22T00:00:00+00:00",
+			"version": "1.3"
 		}
 	],
 	"translators": [
@@ -43,7 +43,8 @@
 		"Enida",
 		"HERWAN",
 		"Dayak Salako",
-		"Yohanes"
+		"Yohanes",
+		"dayaksalako"
 	],
 	"finished_chunks": [
 		"front-title",