Sat Mar 21 2020 13:28:40 GMT+0700 (SE Asia Standard Time)
This commit is contained in:
parent
94b825ccc6
commit
451f7b6578
|
@ -1,6 +1,5 @@
|
|||
[
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"title": "ຂໍ້ມູນທົ່ວໄປ",
|
||||
"body": "ປະຊາຊົນອິດສະຣາເອນຖາມຄຳຖາມເອເຊກຽນ ແລະ ເອເຊກຽນບອກສິ່ງທີ່ ພຣະຢາເວ ໄດ້ກ່າວຕໍ່ພວກເຂົາ."
|
||||
},
|
||||
|
@ -19,9 +18,5 @@
|
|||
{
|
||||
"title": "ລົ້ມລົງດ້ວຍຄົມດາບ",
|
||||
"body": "ອາດແປໄດ້ອີກວ່າ: \"ຖືກຂ້າຕາຍໃນສົງຄາມ\" (ເບິ່ງ: figs_metonymy)"
|
||||
=======
|
||||
"title": "",
|
||||
"body": "(ເບິ່ງເພີ່ມເຕີມ: figs_synecdoche)"
|
||||
>>>>>>> 02199bc5b19249cc90edb56a721d0036cf2ada34
|
||||
}
|
||||
]
|
|
@ -1,11 +1,6 @@
|
|||
[
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"title": "ບົດທີ 25",
|
||||
"body": "ບົດທີ 25"
|
||||
=======
|
||||
"title": "ບົດທີ 25",
|
||||
"body": "ບົດທີ 25"
|
||||
>>>>>>> 02199bc5b19249cc90edb56a721d0036cf2ada34
|
||||
}
|
||||
]
|
Loading…
Reference in New Issue