2022.05.19 crossword

[roygbyte]

Updates crossword repo to latest version, which includes a bug fix and introduces the "reveal square" game menu item.

---

This change is 

[Frenzie]

@poire-z What did you say your preferred way of rebasing was?

[poire-z]

In which context ? Via github or command line ? Anyway, here it looks like just a submodule bump, so probably better just redone. And here, it's just the first 2 commits that are old and already merged. So, I would probably do:

$ git checkout master
$ git fetch upstream
$ git merge upstream/master
$ git push origin master
$ git checkout 2022.05.19-crossword
$ git rebase origin/master

and I guess it should notice the presence of the 2 first commits and drop them. If not, drop the 2 commits and create a new one:

git reset HEAD~3
git add crossword.koplugin
git commit -v

[roygbyte]

I do not understand this conflict. crossword.kolpugin is the plugin folder.

[Frenzie]

That would mean your branch deviated from this repo in that regard. You'll need to merge or rebase using @poire-z's instructions or the ones from GitHub.

[Frenzie]

That seems to have worked. :+1: All ready for merge? And which instructions did you use?

[roygbyte]

Woooooo 🎉

Yes, were ready captain.

@poire-z instructions paved the way...