Take a look at https://github.com/leo-editor/leo-editor/branches/active.
Traceback (most recent call last):File "/home/travis/build/leo-editor/leo-editor/leo/core/leoTest.py", line 1364, in checkFileSyntaxtree = compile(s + '\n', fileName, 'exec')File "viewrendered3", line 945<<<<<<< HEAD^SyntaxError: invalid syntax
I think there's more to it though. Thomas's PR is stuck in "waiting for status to be reported" mode, and I found a lot of similar threads. Sounds like a recurring GitHub <-> Travis integration problem. I've asked for help.
Take a look at https://github.com/leo-editor/leo-editor/branches/active.umm, no.[Later] after some poking around discovered the [Requests] page.which says "GitHub payload is missing a merge commit (mergeable_state: "unknown", merged: false)" starting 4 hours ago and continuing for next 4 commits.I made a small commit to devel, which did trigger a new build, and that failed with "syntax error in: viewrendered2" (ref). Looks like a remaining merge marker: