Tue Feb 28 2017 09:40:40 GMT-0400 (AST)
This commit is contained in:
parent
2fc89b07b3
commit
5acda805b9
|
@ -1,5 +0,0 @@
|
|||
<<<<<<< HEAD
|
||||
Genesis
|
||||
=======
|
||||
Génesis
|
||||
>>>>>>> 99beb78241f63bd9075c68f15ab320aed8303cb5
|
|
@ -1 +1,5 @@
|
|||
Génesis
|
||||
<<<<<<< HEAD
|
||||
Genesis
|
||||
=======
|
||||
Génesis
|
||||
>>>>>>> 99beb78241f63bd9075c68f15ab320aed8303cb5
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"package_version": 6,
|
||||
"package_version": 7,
|
||||
"format": "usfm",
|
||||
"generator": {
|
||||
"name": "ts-desktop",
|
||||
|
|
Loading…
Reference in New Issue