Merge remote-tracking branch 'origin/master'

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