LPD-33793 Configure git merge driver

ealonso · Aug 13, 2024 · 0ff8d16 · 0ff8d16
1 parent f661ac1
commit 0ff8d16
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 *.pom	text eol=lf
 .m2-tmp/**/*.pom linguist-generated=true
-ivy.xml	text eol=lf
+ivy.xml	text eol=lf
+modules/_node-scripts/package.json merge=node-scripts