diff --git a/01/01.txt b/01/01.txt index cb645e2..f172c49 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1,5 @@ -\v 1 In the days when the judges ruled there was a famine in the land of Israel. \v 2 An Ephrathite man from Bethlehem of Judah named Abimilech took his wife and two sons to live as foreigners in the land of Moab. \f + \ft Some translations read \fqa This is a really great story.\fqa* But not all say this. \f* I forgot to add this other sentence. \ No newline at end of file +<<<<<<< HEAD +\v 1 In the days when the judges ruled there was a famine in the land of Israel. \v 2 An Ephrathite man from Bethlehem of Judah named Abimilech took his wife and two sons to live as foreigners in the land of Moab. \f + \ft Some translations read \fqa This is a really great story.\fqa* But not all say this. \f* I forgot to add this other sentence. +======= +\c 1 \v 1 In the days when the judges ruled there was a famine in the land of Israel. \v 2 An Ephrathite man from Bethlehem of Judah named Abimilech took his wife and two sons to live as foreigners in the land of Moab. \f + \ft Some translations read \fqa This is a really great story.\fqa* But not all say this. \f* I forgot to add this other sentence. +>>>>>>> 30496a8d6651d9de1d74ad1dae63719202776100 diff --git a/01/title.txt b/01/title.txt new file mode 100644 index 0000000..a03794c --- /dev/null +++ b/01/title.txt @@ -0,0 +1 @@ +First Chapter \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index fa8a554..7f05a32 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1 +1,5 @@ -Ruth \ No newline at end of file +<<<<<<< HEAD +Ruth +======= +The book of Ruth +>>>>>>> 30496a8d6651d9de1d74ad1dae63719202776100 diff --git a/manifest.json b/manifest.json index 4627f30..cba402a 100644 --- a/manifest.json +++ b/manifest.json @@ -32,6 +32,8 @@ } ], "parent_draft": {}, - "translators": [], + "translators": [ + "Jessica Kuck" + ], "finished_chunks": [] } \ No newline at end of file