diff --git a/09/22.txt b/09/22.txt index d5525d4..83dc0b8 100644 --- a/09/22.txt +++ b/09/22.txt @@ -1 +1,5 @@ -\v 22 Ura tuoneh madah upo yok, sidok takut ngau ura-ura Yahudi. Ute ura Yahudi udah bepekat, ngau semuo ura, sapopun ura te ngakuk Yesus jadi Kristus, tentu sidok akan di pebencik pangan di dangau mau'k pun diluar gerijo. \v 23 Yoklah penyebabneh, ura tuo apaineh madah, "Neh kedirik udah Tuo, tanyok gen'no ngauneh. \ No newline at end of file +<<<<<<< HEAD +\v 22 Ura tuoneh madah upo yok, sidok takut ngau ura-ura Yahudi. Ute ura Yahudi udah bepekat, ngau semuo ura, sapopun ura te ngakuk Yesus jadi Kristus, tentu sidok akan di pebencik pangan di dangau mau'k pun diluar gerijo. \v 23 Yoklah penyebabneh, ura tuo apaineh madah, "Neh kedirik udah Tuo, tanyok gen'no ngauneh. +======= +\v 23 +>>>>>>> c42684d710c0b43ce2d19c15fee1f7d204f6e89c diff --git a/LICENSE.md b/LICENSE.md index 2cadbf0..0634d06 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,7 +2,11 @@ # License ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) +<<<<<<< HEAD This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/). +======= +This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/. +>>>>>>> c42684d710c0b43ce2d19c15fee1f7d204f6e89c ### You are free to: @@ -25,3 +29,8 @@ The licensor cannot revoke these freedoms as long as you follow the license term You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation. No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material. +<<<<<<< HEAD +======= + +This PDF was generated using Prince (https://www.princexml.com/). +>>>>>>> c42684d710c0b43ce2d19c15fee1f7d204f6e89c diff --git a/manifest.json b/manifest.json index ff37d5f..0417d07 100644 --- a/manifest.json +++ b/manifest.json @@ -223,7 +223,6 @@ "09-13", "09-16", "09-19", - "09-22", "09-24", "09-26", "09-28",