Skip to content

Commit

Permalink
Update .gitattributes to avoid CHANGELOG.md conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmacklin
mmacklin committed Jul 3, 2024
1 parent 95bf102 commit ed20dfc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
# Exclude vendored code from project language stats
warp/native/cutlass/** linguist-vendored
tools/** linguist-vendored

CHANGELOG.md merge=union

0 comments on commit ed20dfc

Please sign in to comment.