gistfile1.txt

➜  release-kickoff git:(post-18-integration) git rebase -i -p 9027bcb                     
[detached HEAD f9d6d51] Add helper method for CEF event logging; log when username is missing.
 8 files changed, 439 insertions(+), 33 deletions(-)
 create mode 100644 kickoff/cef.py
 create mode 100644 vendor/lib/python/cef.py
Auto-merging kickoff/views/submit.py
CONFLICT (content): Merge conflict in kickoff/views/submit.py
Auto-merging kickoff/views/releases.py
CONFLICT (content): Merge conflict in kickoff/views/releases.py
Auto-merging kickoff/__init__.py
CONFLICT (content): Merge conflict in kickoff/__init__.py
Automatic merge failed; fix conflicts and then commit the result.
Error redoing merge ebf76b4d7ef1b7e8f4b3aed656fb42df1cc413d9