Thomas, the fix branch fixes vr3.py

[Edward K. Ream]

Here is the checkin log for rev 69288fd in the fix branch:

QQQ

Manually remove the git merge conflict markers as follows:
   
In *all* cases, removed everything between <<<< and ===, using the second version.
   
Fixed one unmatched docstring delim.
   
Pylint reports that "h" is undefined in store_layout.
Neither version defined it.

QQQ

Imo, this version is probably the best place for you to start. You are, however, free to use another base.

I would like to merge fix into devel soon. Please let me know what you would like to do.

Edward

[Thomas Passin]

I merged the files.  For some reason I couldn't push my changes upstream  to the "fix" branch.  Although I was logged in to Github, it said it couldn't authenticate.  So I pushed the changes to the devel branch of my own fork and sent a PR.

[Thomas Passin]

Edward, if you retrieved this file before about 9:30 PM Eastern, please get it again.  I found a bug where the line h = c.hash() in store_layout had been removed during my merge.  It needs to be there.

[Edward K. Ream]

On Wed, Apr 1, 2020 at 8:35 PM Thomas Passin <tbp1...@gmail.com> wrote:

Edward, if you retrieved this file before about 9:30 PM Eastern, please get it again.  I found a bug where the line h = c.hash() in store_layout had been removed during my merge.  It needs to be there.

Thomas, I have just hand copied your latest version into devel. I did this because approving your PR generated merge conflicts, so we would have been right back where we started from!  The checkin log:

QQQ

Copy 586120f... to vr3.py by hand.
https://github.com/leo-editor/leo-editor/commit/586120f8add84a21de43b5713e4165be7c1633ca

QQQ

I'm pretty sure the code in devel is what you want. It includes the line `h = c.hash()` in store_layout. All unit tests pass and pylint is happy.

Going forward

I don't know why your recent PR's generated so many conflicts. I would like to make that moot. I am not going to touch vr3.py in any way. Feel free to work directly in devel, or on a public branch based on devel.

Edward