Merge ours for package.json, package-lock.json, composer.json, and co…

…mposer.lock in the stubs/.gitattributes.stub file. (#9)
fuelviews · Nov 13, 2024 · d6738ed · d6738ed
1 parent a3a264f
commit d6738ed
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/stubs/.gitattributes.stub b/stubs/.gitattributes.stub
@@ -29,7 +29,3 @@ CHANGELOG.md        export-ignore
 # Merge ours
 *.css merge=ours
 *.js merge=ours
-package.json merge=ours
-package-lock.json merge=ours
-composer.json merge=ours
-composer.lock merge=ours