Closed ghoomfrog closed 4 years ago
Thank you very much!
It seems that you are trying to merge with master
. I will merge your changes first with dev
because I need to make a release then I will merge with master.
I have merged your work with the dev
branch. Due to your commit being in a branch that comes from master
I have rebased your work onto dev
. I will make a release later and merge with master
.
Thanks again!
There was additional text relating to "laso" in the definition of "lape" as a modifier: "sleeping, of sleep laso mod blue, blue-green"