Cleanup after a rebase
This commit is contained in:
parent
74ede7376c
commit
a8e0322a85
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user