Fri Feb 19 2021 13:39:04 GMT-0400 (hora de Venezuela)

2021-02-19 13:39:05 -04:00 · 2021-02-19 13:39:05 -04:00 · 7da5d6e2a3
parent 6fba8f09da
commit 7da5d6e2a3
1 changed files with 1 additions and 5 deletions
--- a/20/reference.txt
+++ b/20/reference.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Una historia Bíblica de 2 Reyes 17; 24-25  2 Crónicas 36; Esdras 1 '10; Nehemías 1-13
-=======
-Una historia de la Biblia de: 2 Reyes 17; 24-25; 2 Crónicas 36; Esdras 1-10; Nehemias 1-13
->>>>>>> 9ec7593bc40e0e155b09a23abacd4d192bbe8767
+Una historia Bíblica de 2 Reyes 17; 24-25  2 Crónicas 36; Esdras 1 '10; Nehemías 1-13