diff --git a/01/01.txt b/01/01.txt index f47dccb..ae5e909 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1,5 @@ -\c 1 \v 1 \v 2 \v 3 this is from Matthrew Ch 1 v 1-3-4 \ No newline at end of file +<<<<<<< HEAD +\c 1 \v 1 \v 2 \v 3 this is from Matthrew Ch 1 v 1-3-4 +======= +\c 1 \v 1 \v 3 The book of the genealogy of Jesus Christ, son of David, son of \v 2 Abraham. +>>>>>>> 1f53adb198f1c27a03883e9630103235e80b4892 diff --git a/manifest.json b/manifest.json index 53903d3..ece68a1 100644 --- a/manifest.json +++ b/manifest.json @@ -33,7 +33,8 @@ ], "parent_draft": {}, "translators": [ - "Chuck Liesch" + "Chuck Liesch", + "Rene Aril" ], "finished_chunks": [ "02-01"