m[ci skip]

hMatoba · Sep 28, 2016 · c4e5fdd · c4e5fdd
1 parent cbe32c0
commit c4e5fdd
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/doc/changes.rst b/doc/changes.rst
@@ -1,14 +1,11 @@
 Changelog
 =========
 
-<<<<<<< HEAD
 1.0.8
 -----
 
 - Exclude checking extension in "load".
 
-=======
->>>>>>> origin/master
 1.0.7
 -----