WycliffeAssociates
/
en_tw
7
1
Fork 2
Files Issues 14 Pull Requests Releases 2 Wiki Activity See in Reader

Manual resolution of conflict from yesterday

This commit is contained in:
Henry Whitney 2019-09-03 14:19:25 +00:00
parent 7bba83faa5
commit e6af2dbf81
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bible/other/joy.md
View File

@ -1,4 +1,4 @@
# joy, joyful, joyfully, joyfulness, enjoy, enjoys, enjoyed, enjoying, enjoyment, rejoice, gladness, rejoices, rejoiced, rejoicing, glad, makes ... glad, greeting, greetings, be merry, was merry, rejoices greatly, rejoiced greatly, greet, greeted, salute, shout of joy, joyful shouting
# joy, joyful, joyfully, joyfulness, enjoy, enjoys, enjoyed, enjoying, enjoyment, rejoice, gladness, rejoices, rejoiced, rejoicing, glad, makes ... glad, greeting, greetings, be merry, was merry, rejoices greatly, rejoiced greatly, greet, greeted, salute, shout of joy, joyful shouting, celebrate
## Definition: