0.3.1.1

twardoch · Apr 18, 2018 · 8d1288c · 8d1288c
1 parent 4ed6478
commit 8d1288c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/mkdocs_combine/cli/mkdocscombine.py b/mkdocs_combine/cli/mkdocscombine.py
@@ -26,7 +26,7 @@
 import mkdocs_combine
 from mkdocs_combine.exceptions import FatalError
 
-__version__ = '0.3.0.0'
+__version__ = '0.3.1.1'
 
 
 def stdout_file(encoding):
@@ -149,12 +149,8 @@ def main():
             convert_math=args.convert_math,
             add_chapter_heads=args.add_chapter_heads,
             increase_heads=args.increase_heads,
-<<<<<<< HEAD
-            add_page_break=args.add_page_break
-=======
             add_page_break=args.add_page_break,
             convert_admonition_md=args.convert_admonition_md
->>>>>>> 9025fb89486d088980606f0b7d9ce262741c24ed
         )
     except FatalError as e:
         print(e.message, file=sys.stderr)

diff --git a/setup.py b/setup.py
@@ -18,14 +18,10 @@
 setup(
     name='mkdocs-combine',
 
-<<<<<<< HEAD
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.3.0.2',
-=======
-    version='0.3.1.0',
->>>>>>> 9025fb89486d088980606f0b7d9ce262741c24ed
+    version='0.3.1.1',
 
     description='Combines a MkDocs Markdown site into a single Markdown file',