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
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/leo-editor/5d0083a8-db92-4798-a3d3-43e35074aca1%40googlegroups.com.
