From a8e0322a85c284a1cac9fcbc99405ac7cbbafb8b Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Fri, 24 Feb 2023 09:37:39 +0100 Subject: [PATCH] Cleanup after a rebase --- mkdocs_with_confluence/plugin.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/mkdocs_with_confluence/plugin.py b/mkdocs_with_confluence/plugin.py index 5e50311..6f0f340 100644 --- a/mkdocs_with_confluence/plugin.py +++ b/mkdocs_with_confluence/plugin.py @@ -17,10 +17,7 @@ from mkdocs.plugins import BasePlugin from md2cf.confluence_renderer import ConfluenceRenderer from os import environ from pathlib import Path -<<<<<<< HEAD -======= from loguru import logger ->>>>>>> 0153901 (Upload attachments on post page to support other mkdocs plugins (#15)) ENABLE_ENV_VAR = "MKDOCS_TO_CONFLUENCE" DRY_RUN_ENV_VAR = "MKDOCS_TO_CONFLUENCE_DRY_RUN"