Skip to content

Official Zoho CRM Submission - DannyDrills #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DannyDrills wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Official Zoho CRM Submission - DannyDrills #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<<<<<<< HEAD
node_modules/
dist/
.env
=======
Copy link
Copy Markdown

@cursor cursor Bot Mar 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unresolved merge conflict markers committed in gitignore

High Severity

The .gitignore file contains unresolved git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> final-submission/master). This means the file was never properly resolved after a merge and the conflict markers are treated as literal text. This effectively breaks the gitignore rules above the ======= marker (the simplified block), since git interprets the marker lines as file patterns rather than directives.

Additional Locations (1)

Fix in Cursor Fix in Web

Copy link
Copy Markdown

@cursor cursor Bot Mar 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge conflict markers left in gitignore file

High Severity

Unresolved git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> final-submission/master) were committed into .gitignore. Git treats these as literal text patterns rather than directives, which corrupts the ignore rules and includes duplicate entries from both sides of the conflict.

Additional Locations (1)

Fix in Cursor Fix in Web

# Dependencies
node_modules/
npm-debug.log*
Expand Down Expand Up @@ -96,3 +101,4 @@ template/.lua/
*.lua.skill.toml
lua.skill.toml
*.prompt.*
>>>>>>> final-submission/master
Loading