Skip to content

remove stale merge conflict markers - #1369

Open
datagerl wants to merge 6 commits into
Pulsefy:mainfrom
datagerl:docs/testnet-swagger-documentation
Open

datagerl wants to merge 6 commits into
Pulsefy:mainfrom
datagerl:docs/testnet-swagger-documentation

Conversation

@datagerl

Copy link
Copy Markdown
Contributor

Several backend files contained unresolved merge markers left behind from an incomplete conflict resolution. These artifacts created inconsistent code paths and risked breaking startup, module registration, and API documentation generation.

Changes made
Removed stale merge conflict markers from backend files
Restored the correct NestJS startup flow in the application bootstrap
Re-established the intended Swagger configuration and docs setup
Fixed invalid or duplicated module imports and controller registrations
Corrected conflicting decorator and typing logic in verification and reconciliation-related code
Cleaned up duplicated contributor documentation and kept the project guidance consistent

closes #1216

@drips-wave

drips-wave Bot commented Aug 28, 2026

Copy link
Copy Markdown

@datagerl Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

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.

Backend: Publish and enforce a complete OpenAPI specification

1 participant