diff --git a/01/07.txt b/01/07.txt index cbcbfab..e4a94ec 100644 --- a/01/07.txt +++ b/01/07.txt @@ -1 +1,5 @@ -\v 7 Salomon was the father of Roboam, Roboam the father of Abias, Abias the father of Asa, \v 8 Asa the father of Josafat, Josafat was the father of Joram and Joram the father of Uzias. \ No newline at end of file +<<<<<<< HEAD +\v 7 Salomon was the father of Roboam, Roboam the father of Abias, Abias the father of Asa, \v 8 Asa the father of Josafat, Josafat was the father of Joram and Joram the father of Uzias. +======= +\v 7 Salomön was the father of Roboam, Roboam the father of Abias, Abias the father of Asa, \v 8 Asa the father of Josafat, Josafat was the father of Joram, and Joram the father of Uzias. +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/01/09.txt b/01/09.txt index 330fcf3..d8f78b9 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1 +1,5 @@ -\v 9 Uzias the father of Jotam, Jotam the father of Acaz, Acaz the father of Ezequias. \v 10 Ezequias was the father de Manases, Manases the father of Amon, Amon the father of Josias. \v 11 Josias the father of Jeconias y his brother at the time of the deportation to Babylon. \ No newline at end of file +<<<<<<< HEAD +\v 9 Uzias the father of Jotam, Jotam the father of Acaz, Acaz the father of Ezequias. \v 10 Ezequias was the father de Manases, Manases the father of Amon, Amon the father of Josias. \v 11 Josias the father of Jeconias y his brother at the time of the deportation to Babylon. +======= +\v 9 Uzías was the father of Jotam, Jotam the faher of Acaz, Acaz the father of Ezequias. \v 10 Ezequias was the father of Manasés, Manasés the father of Amón, Amón the father of Josías. \v 11 Josias the father of Jeconias and his brothers at the time of deportation to Babylon. +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/01/12.txt b/01/12.txt index 2ebc583..1b83df0 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1 +1,5 @@ -\v 12 And then of the deportation to Babylon, Jeconias was the father of Salatiel, Salatiel the ancestro of Zorobadel. \v 13 Zorobadel the father of Abiud, Abiud the father of Eliaquim, Eliaquin the father of Azor. \v 14 Azor was the father the Sadoc, Sadoc was the father of Aquim, Aquim the father of Eliud. \ No newline at end of file +<<<<<<< HEAD +\v 12 And then of the deportation to Babylon, Jeconias was the father of Salatiel, Salatiel the ancestro of Zorobadel. \v 13 Zorobadel the father of Abiud, Abiud the father of Eliaquim, Eliaquin the father of Azor. \v 14 Azor was the father the Sadoc, Sadoc was the father of Aquim, Aquim the father of Eliud. +======= +\v 12 And after the deportation to Babylon, Jeconias was the father of Salatiel, Salatiel the ancestor of Zorobabel. \v 13 Zorobabel the father of Abiud, Abiud the father of Eliaquim, Eliaquim the father of Azor. \v 14 Azor was the father of Sadoc, Sadoc was the father of Aquim, Aquim the father of Eliud. +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/01/15.txt b/01/15.txt index fa64b13..46f154d 100644 --- a/01/15.txt +++ b/01/15.txt @@ -1 +1,5 @@ -\v 15 Eliud of father of Eleazar, Eleazar of father of Matán, Matán of father of Jacob. \v 16 Jacob of father of Jose the husband of Maria, through of who Jesus was born, to who is called Christ. \v 17 The generations from Abraham to David were fourteen, from David to the deportation of Babylon fourteen, and of the deportation to Babylon to Christ fourteen generations. \ No newline at end of file +<<<<<<< HEAD +\v 15 Eliud of father of Eleazar, Eleazar of father of Matán, Matán of father of Jacob. \v 16 Jacob of father of Jose the husband of Maria, through of who Jesus was born, to who is called Christ. \v 17 The generations from Abraham to David were fourteen, from David to the deportation of Babylon fourteen, and of the deportation to Babylon to Christ fourteen generations. +======= +\v 15 Eliud was the father of Eleazar, Eleazar the father of Matán, Matán the father of Jacob. \v 16 Jacob the father of Joseph and husband of Maria the mother of Jesus, who is called Christ. \v 17 The generations from Abraham to David was fourteen, from David to the deportation to Babylon was fourteen, and from deportation to Babylon to Christ was fourteen +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/01/18.txt b/01/18.txt index 30afcc8..f927647 100644 --- a/01/18.txt +++ b/01/18.txt @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD \v 18 The birth of jesus christ it happened as follows. his mother Maria she was engaged to marry Joseph, but before they got together, she found herself prenant through the holy spirit. \v 19 her husband Joseph he was a fair man, but he didn't want to embarrass her publicly. so i decided to finish with your commitment to her secretly. ======= \v 18 The birt of Jesu christ happened in the following way. His mother was engaged to marry Jose, but before together, she found herselt pregnant by tje Holy Spirit. \v 19 Her husbad was a fair man, but he didn't want to embarrass her publicly. So he decided to end his ngagement whit her secretly. >>>>>>> 47cd36a8298b4b6dce6c4ba61258492a4f703cfe +======= +\v 18 This is how the birth of Jesus Christ happened. His mother Maria has been engagement to be married with Joseph, but before they maried, she was pregnant by the Holy Spirit. \v 19 Her husband Joseph being a just man, but he don´t embarrass her in public. Then he decide brooke the engagement with her in secret. +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/01/title.txt b/01/title.txt new file mode 100644 index 0000000..7f596a0 --- /dev/null +++ b/01/title.txt @@ -0,0 +1 @@ +Chapter 1 \ No newline at end of file diff --git a/28/18.txt b/28/18.txt index 0cb7c71..074820a 100644 --- a/28/18.txt +++ b/28/18.txt @@ -1,6 +1,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD \v 18 Jesus arrive to they and He tell them: "He is all autority in the sky and on the earth. \v 19 So, you go out and you make followers of all the nations." ======= \v 18 Jesus came to them and told them:"all authority has been given to me in heaven and on earth \v 19 go then, and make disciples of all nations. baptizing them in name of the father @@ -11,3 +12,6 @@ ======= \v 18 Jesús came to them and say: " all authority is given to me in heaven and earth. \v 19 Go to make disciples in all nations. Baptizing in the name the Father, son an holy spirit. >>>>>>> e91afbb156bdfd470b0aed652797694103325137 +======= +\v 18 Jesus came to them and said: "All authority was given to me in the heaven and in the earth. \v 19 Then go, and make disciples in every nations, baptizing them in the name of the Father, the Son, and the Holly Spirit. +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/28/20.txt b/28/20.txt index 5c39bb2..9fb27ed 100644 --- a/28/20.txt +++ b/28/20.txt @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD \v 20 Tech them to obey everything I have commanded you. And see, I am with you every day, until the end of the world." ======= \v 20 Teaching obedience all everything I said. And see that I will be with you until the end of the world. >>>>>>> e91afbb156bdfd470b0aed652797694103325137 +======= +\v 20 Teaching them to obey all that I was commanded you. And see, I will be with you all the days, until the end of the word. +>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4 diff --git a/28/title.txt b/28/title.txt new file mode 100644 index 0000000..13fb89d --- /dev/null +++ b/28/title.txt @@ -0,0 +1 @@ +Matthew 28 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt new file mode 100644 index 0000000..6e30ae1 --- /dev/null +++ b/front/title.txt @@ -0,0 +1 @@ +Matthew \ No newline at end of file diff --git a/manifest.json b/manifest.json index 97ecc41..79b9bb2 100644 --- a/manifest.json +++ b/manifest.json @@ -38,14 +38,12 @@ "GiselaMeza", "Damaris_Godoy", "Rayxi_cabarcas", - "paco_camacho" + "paco_camacho", + "robykruger" ], "finished_chunks": [ "01-22", "01-24", - "01-07", - "01-09", - "01-12", - "01-15" + "01-title" ] } \ No newline at end of file