Merge remote master

heaths · Jul 15, 2017 · 381b04b · 381b04b
2 parents 43580f7 + b622f6a
commit 381b04b
Show file tree

Hide file tree

Showing 3 changed files with 5,233 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 ### 1.1.0 (2017-07-10)
 
+<<<<<<< HEAD
 * ([@101100](https://github.com/101100)) Added configuration options for different formats
 * Added CHANGELOG.md
+=======
+* [[101100](https://github.com/101100)] Added configuration options for different formats
+* Added CHANGELOG.md
+>>>>>>> b622f6a84d9f1474cb9fa949e607f6e2f1ae2eb0