Skip to content

fix: remove unresolved conflict markers from main - #66

Merged
aeonmatrixcommand-debug merged 1 commit into
mainfrom
fix/main-conflict-markers
Aug 21, 2026
Merged

fix: remove unresolved conflict markers from main#66
aeonmatrixcommand-debug merged 1 commit into
mainfrom
fix/main-conflict-markers

Conversation

@aeonmatrixcommand-debug

Copy link
Copy Markdown
Owner

Removes unresolved Git conflict artifacts already present on main.

Changes:

  • Remove conflict markers and duplicate guardian_audit.json entry from .gitignore
  • Remove duplicated conflict block from strategic_intelligence/opportunity_radar.py
  • Preserve the existing working OpportunityRadar implementation

Validation:

  • Conflict marker scan: clean
  • Python compile: passed
  • Opportunity Radar smoke test: passed
  • Full test suite: 264 passed, 1 skipped
  • git diff --check: passed

@aeonmatrixcommand-debug
aeonmatrixcommand-debug merged commit f1e883d into main Aug 21, 2026
11 checks passed
@aeonmatrixcommand-debug
aeonmatrixcommand-debug deleted the fix/main-conflict-markers branch August 21, 2026 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant