Commit a5a1999f authored by Forest Gregg's avatar Forest Gregg

remove merge conflict trace

parent 2f7e7ae7
language: python
sudo: false
<<<<<<< HEAD
matrix:
include:
- os: linux
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment