diff --git a/stubs/.gitattributes.stub b/stubs/.gitattributes.stub index 9259ef8..103179d 100644 --- 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