On Wed, Apr 1, 2020 at 8:35 PM Thomas Passin 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*
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.
On Wednesday, April 1, 2020 at 8:00:27 PM UTC-4, Thomas Passin wrote:
>
> I merged the files.
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.
On Wednesday, April 1, 2020 at 6:31:35 PM UTC-4,
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
