DCS-Mirror
/
tc01_en-x-demo1_php_text_reg
mirror of https://git.door43.org/tc01/en-x-demo1_php_text_reg
2
0
Fork 0
Files Issues Releases Wiki Activity See in Reader

Fri Oct 07 2016 16:20:01 GMT-0500 (CDT)

This commit is contained in:
qa5 2016-10-07 16:20:01 -05:00
parent 1cd1711090
commit 59d831df8e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
01/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 1 \v 1 Paul and Timothy, servants of Christ Jesus, to all those set apart in Christ Jesus who are at Philippi, with the overseers and deacons. \v 2 Grace to you and peace from God our Father and the Lord Jesus Christ.
=======
Paul and Timothy
>>>>>>> 54c6337b5524ebf945c2f19c7061a530030f6373
\c 1 \v 1 Paul and Timothy, servants of Christ Jesus, to all those set apart in Christ Jesus who are at Philippi, with the overseers and deacons. \v 2 Grace to you and peace from God our Father and the Lord Jesus Christ.