metamask-extension/.gitattributes

CHANGELOG.md merge=union

# Reviewing the lockfile contents is an important step in verifying that
# we're using the dependencies we expect to be using
package-lock.json linguist-generated=false
yarn.lock linguist-generated=false
Fix gitattributes 2016-06-30 02:28:49 +02:00			`CHANGELOG.md merge=union`
Show lockfile diffs on GitHub (#6857) 2019-07-15 22:10:05 +02:00
			`# Reviewing the lockfile contents is an important step in verifying that`
			`# we're using the dependencies we expect to be using`
			`package-lock.json linguist-generated=false`
			`yarn.lock linguist-generated=false`