Remove accidental commit marker.

Flnch · Dec 18, 2015 · be12269 · be12269
1 parent 1e5c4a8
commit be12269
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,5 +66,3 @@ coverage.xml
 
 # Sphinx documentation
 docs/_build/
-
->>>>>>> 95fa9a69c555f5556582f79fc142d10c240ee02d