jsnbuchanan/crowd-funder-for-time-pwa
1
0
Fork 1
forked from trent_larson/crowd-funder-for-time-pwa
Code Issues Pull Requests Projects Releases Wiki Activity

doc: Fix merge conflict.

Browse Source
This commit is contained in:
Trent Larson
2025-08-19 19:56:54 -06:00
parent fe08db1e95
commit 7d73e09de7
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.cursor/rules/software_development.mdc
View File

@@ -171,7 +171,6 @@ debugging, architecture decisions, and testing.
- [ ] Environment impact assessed for team members - [ ] Environment impact assessed for team members
- [ ] Pre-build validation implemented where appropriate - [ ] Pre-build validation implemented where appropriate
<<<<<<< HEAD
## Additional Core Principles ## Additional Core Principles
### 4. Dependency Management & Environment Validation ### 4. Dependency Management & Environment Validation
@@ -224,12 +223,3 @@ debugging, architecture decisions, and testing.
- **Narrow Types Properly**: Use type guards to narrow `unknown` types safely - **Narrow Types Properly**: Use type guards to narrow `unknown` types safely
- **Document Type Decisions**: Explain complex type structures and their purpose - **Document Type Decisions**: Explain complex type structures and their purpose
=======
---
**Status**: Active development guidelines
**Priority**: High
**Estimated Effort**: Ongoing
**Dependencies**: base_context.mdc, research_diagnostic.mdc
**Stakeholders**: Development team
>>>>>>> master