Tue Apr 18 2017 14:01:20 GMT-0500 (CDT)
This commit is contained in:
parent
099528e3cd
commit
8a3b1a37a4
12
01/03.txt
12
01/03.txt
|
@ -1,10 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
\v 3 I thank my God with every thought of you,
|
||||
\v 4 Every time I pray for you, it is always a prayer of joy.
|
||||
\v 5 I give thanks for your fellowship in the gospel from the first day until now.
|
||||
\v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
|
||||
|
||||
|
||||
=======
|
||||
\v 3 I thank my God with every thought of you, \v 4 Every time I pray for you, it is always a prayer of joy. \v 5 I give thanks for your fellowship in the gospel from the first day until now. \v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
|
||||
>>>>>>> 9c846c36e6fe1e25e3849ebdd67b244a745ec9f8
|
||||
\v 4 Every time I pray for you, it is always a prayer of joy.
|
||||
\v 5 I give thanks for your fellowship in the gospel from the first day until now.
|
||||
\v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
|
|
@ -1,37 +1,38 @@
|
|||
{
|
||||
"project": {
|
||||
"id": "php",
|
||||
"name": ""
|
||||
},
|
||||
"type": {
|
||||
"id": "text",
|
||||
"name": "Text"
|
||||
},
|
||||
"package_version": 7,
|
||||
"format": "usfm",
|
||||
"generator": {
|
||||
"name": "ts-desktop",
|
||||
"build": "132"
|
||||
},
|
||||
"package_version": 7,
|
||||
"target_language": {
|
||||
"direction": "ltr",
|
||||
"id": "en-x-demo1",
|
||||
"name": "English demo1"
|
||||
},
|
||||
"format": "usfm",
|
||||
"project": {
|
||||
"id": "php",
|
||||
"name": "Philippians"
|
||||
},
|
||||
"type": {
|
||||
"id": "text",
|
||||
"name": "Text"
|
||||
},
|
||||
"resource": {
|
||||
"id": "reg"
|
||||
},
|
||||
"translators": [
|
||||
"qa99"
|
||||
],
|
||||
"source_translations": [
|
||||
{
|
||||
"language_id": "en",
|
||||
"resource_id": "ulb",
|
||||
"checking_level": 3,
|
||||
"date_modified": 20160614,
|
||||
"version": "5"
|
||||
"checking_level": "3",
|
||||
"date_modified": 20161227,
|
||||
"version": "8"
|
||||
}
|
||||
],
|
||||
"translators": [
|
||||
"qa99",
|
||||
"c"
|
||||
],
|
||||
"finished_chunks": []
|
||||
}
|
Loading…
Reference in New Issue