Manual resolution of conflict from yesterday

Pasted in from my computer
This commit is contained in:
Henry Whitney 2019-09-03 14:18:15 +00:00
parent 1f9b7ee922
commit 7bba83faa5
1 changed files with 1 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# hard, harder, hardest, harden, hardens, hardened, hardening, hardness, hardship, dull, strict, bitter, bitterly, bitterness, roughly, difficult, with difficulty
# hard, harder, hardest, harden, hardens, hardened, hardening, hardness, hardship, dull, strict, bitter, bitterly, bitterness, roughly, difficult, with difficulty, severe
## Definition: