forked from Dominred/en_tw
Fixed conflict.
This commit is contained in:
parent
c1ade9b286
commit
66bc71f80d
|
@ -1,4 +1,4 @@
|
|||
# rebuke, rebukes, rebuked, correct, corrected, correction, reproved, give correction, convicted, expose, exposed, convict
|
||||
# rebuke, rebukes, rebuked, correct, corrected, correction, corrections, reproved, give correction, convicted, expose, exposed, convict
|
||||
|
||||
## Definition:
|
||||
|
||||
|
|
|
@ -34,5 +34,4 @@ A "word" refers to something that someone has said.
|
|||
|
||||
## Word Data:
|
||||
|
||||
* Strong's: H561, H562, H565, H1697, H1703, H2656, H2706, H4405, H4406, H6310, G518, G1024, G1310, G3054, G3055, G3056, G4086, G4487, G5023, G5537, G5542
|
||||
|
||||
* Strong's: H561, H562, H565, H1697, H1703, H2656, H2706, H4405, H4406, H6310, H7878, G518, G1024, G1310, G3054, G3055, G3056, G4086, G4487, G5023, G5537, G5542
|
||||
|
|
Loading…
Reference in New Issue