mirror of
https://github.com/chatmail/relay.git
synced 2026-05-10 16:04:37 +00:00
Update cmdeploy/src/cmdeploy/__init__.py
Co-authored-by: missytake <missytake@systemli.org>
This commit is contained in:
@@ -824,7 +824,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
|
||||
if not www_path.is_dir():
|
||||
logger.warning("Building web pages is disabled in chatmail.ini, skipping")
|
||||
elif (path := find_merge_conflict(src_dir)) is not None:
|
||||
logger.warning(f"Merge conflict found in {path}, skipping")
|
||||
logger.warning(f"Merge conflict found in {path}, skipping website deployment. Fix merge conflict if you want to upload your web page.")
|
||||
else:
|
||||
# if www_folder is a hugo page, build it
|
||||
if build_dir:
|
||||
|
||||
Reference in New Issue
Block a user