Skip to content

Commit

Permalink
chore: update .gitattributes
Browse files Browse the repository at this point in the history
- normalize EoL characters
- make `package-lock.json` conflicts easier to deal w/
  • Loading branch information
boneskull committed Apr 7, 2023
1 parent 102cd39 commit c71c043
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
* text=auto eol=lf

test/assets/*.app/** merge=binary

# Handle as a text file but merge as binary.
package-lock.json merge=binary

0 comments on commit c71c043

Please # to comment.