Merge branch 'mmacklin-main-patch-34454' into 'main'

Update .gitattributes to avoid CHANGELOG.md conflicts See merge request omniverse/warp!600
NVIDIA · Jul 3, 2024 · c093ad4 · c093ad4
2 parents 95bf102 + ed20dfc
commit c093ad4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -17,3 +17,5 @@
 # Exclude vendored code from project language stats
 warp/native/cutlass/** linguist-vendored
 tools/** linguist-vendored
+
+CHANGELOG.md merge=union