forked from WycliffeAssociates/en_tw
Manual resolution of conflict from yesterday
This commit is contained in:
parent
7bba83faa5
commit
e6af2dbf81
|
@ -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:
|
||||
|
||||
|
|
Loading…
Reference in New Issue