From 5d0d151b5beffc263ef3c1032d508e88be3c886f Mon Sep 17 00:00:00 2001
From: Vatsana <you@example.com>
Date: Sat, 21 Mar 2020 11:23:53 +0700
Subject: [PATCH] Sat Mar 21 2020 11:23:52 GMT+0700 (SE Asia Standard Time)

---
 17/05.txt     | 5 -----
 manifest.json | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/17/05.txt b/17/05.txt
index 266c909..40f7599 100644
--- a/17/05.txt
+++ b/17/05.txt
@@ -1,6 +1,5 @@
 [
 	{
-<<<<<<< HEAD
 		"title": "ຂໍ້ມູນທົ່ວໄປ",
 		"body": "ນີ້ແມ່ນການສືບຕໍ່ຄຳອຸປະມາກ່ຽວກັບນົກອິນຊີ."
 	},
@@ -43,9 +42,5 @@
 	{
 		"title": "ມັນໄດ້ແຕກ​ກິ່ງກ້ານ​ທັງຫລາຍ ແລະ ໄດ້ແຕກຫນໍ່​ທັງຫລາຍ",
 		"body": "\"ເແຕກກ່ິງກ້ານ ແລະ ແຕກຫນໍ່ຂອງມັນ\""
-=======
-		"title": "",
-		"body": ""
->>>>>>> 731fa3943758e89baee0bb72a7a9979dc8000324
 	}
 ]
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 715bb50..7b7f08b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,7 +37,8 @@
 		"Sangouane Ounbounheuang",
 		"BounphengThammavong",
 		"Paull1966",
-		"latdavanh"
+		"latdavanh",
+		"Vatsana Saleuxay"
 	],
 	"finished_chunks": [
 		"front-title",