From 8d1288c835a6bdcba1e095b165d947efd159bbed Mon Sep 17 00:00:00 2001 From: Adam Twardoch Date: Wed, 18 Apr 2018 17:10:16 +0200 Subject: [PATCH] 0.3.1.1 --- mkdocs_combine/cli/mkdocscombine.py | 6 +----- setup.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mkdocs_combine/cli/mkdocscombine.py b/mkdocs_combine/cli/mkdocscombine.py index a70056e..6478ee6 100644 --- 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 index f95036c..3f89a9a 100644 --- 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',