Sat Mar 21 2020 13:28:40 GMT+0700 (SE Asia Standard Time)

This commit is contained in:
Vatsana 2020-03-21 13:28:41 +07:00
parent 94b825ccc6
commit 451f7b6578
2 changed files with 0 additions and 10 deletions

View File

@ -1,6 +1,5 @@
[
{
<<<<<<< HEAD
"title": "ຂໍ້ມູນທົ່ວໄປ",
"body": "ປະຊາຊົນອິດສະຣາເອນຖາມຄຳຖາມເອເຊກຽນ ແລະ ເອເຊກຽນບອກສິ່ງທີ່ ພຣະຢາເວ ໄດ້ກ່າວຕໍ່ພວກເຂົາ."
},
@ -19,9 +18,5 @@
{
"title": "​ລົ້ມ­ລົງ​ດ້ວຍ​ຄົມດາບ",
"body": "ອາດແປໄດ້ອີກວ່າ: \"ຖືກຂ້າຕາຍໃນສົງຄາມ\" (ເບິ່ງ: figs_metonymy)"
=======
"title": "",
"body": "(ເບິ່ງເພີ່ມເຕີມ: figs_synecdoche)"
>>>>>>> 02199bc5b19249cc90edb56a721d0036cf2ada34
}
]

View File

@ -1,11 +1,6 @@
[
{
<<<<<<< HEAD
"title": "ບົດ​ທີ 25",
"body": "ບົດ​ທີ 25"
=======
"title": "ບົດທີ 25",
"body": "ບົດທີ 25"
>>>>>>> 02199bc5b19249cc90edb56a721d0036cf2ada34
}
]