Merge remote-tracking branch 'origin/master'

# Conflicts:
#	43-LUK/17.usfm
This commit is contained in:
Tom Warren 2017-03-30 11:16:48 -04:00
commit 6cbaa628bb
1 changed files with 3 additions and 0 deletions

View File

@ -74,6 +74,9 @@
\s5
\v 37 His disciples said to him, "Lord, where will this happen?" He replied to them, "Wherever there is a dead body, the vultures will gather to eat it."
<<<<<<< HEAD
text
=======
>>>>>>> origin/master