gh-christianlouis-docuelevate/BUILD_DATE at c7d67031d46a4d756189ae2ce881917fc18ec97b - gh-christianlouis-docuelevate - Gitea

gitea-admin/gh-christianlouis-docuelevate

Files

T

copilot-swe-agent[bot] c7d67031d4 fix: resolve merge conflicts with main branch

Merge origin/main into feature branch, resolving 18 conflicts:
- app/api/__init__.py: add classification_rules_router alongside system_reset_router
- app/config.py: keep system reset settings from main
- app/models.py: keep ClassificationRuleModel alongside main's models
- app/utils/settings_service.py: keep factory reset settings from main
- app/views/__init__.py: keep system_reset_router from main
- tests/conftest.py: add ClassificationRuleModel import
- migrations/env.py: add ClassificationRuleModel import
- .env.demo, docs/*, frontend/*, mobile/*: keep additions from main
- BUILD_DATE, GIT_SHA, RUNTIME_INFO, VERSION, CHANGELOG.md: accept main's version

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>

2026-03-17 11:09:39 +00:00

2 lines

21 B

Plaintext

Raw Blame History

2026-03-17T09:55:43Z