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

test/e2e/send-eth-with-private-key-test/ethereumjs-tx.js linguist-vendored linguist-generated
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`
I5849 incremental account security (#6874) * Implements ability to defer seed phrase backup to later * Adds incremental-security.spec.js, including test dapp that sends signed tx with stand alone localhost provider * Update metamask-responsive-ui for incremental account security changes * Update backup-notification style and fix responsiveness of seed phrase screen * Remove uneeded files from send-eth-with-private-key-test/ * Apply linguist flags in .gitattributes for send-eth-with-private-key-test/ethereumjs-tx.js * Improve docs in controllers/onboarding.js * Clean up metamask-extension/test/e2e/send-eth-with-private-key-test/index.html * Remove unnecessary newlines in a couple first-time-flow/ files * Fix import of backup-notification in home.component * Fix git attrs file 2019-08-02 05:57:26 +02:00
			`test/e2e/send-eth-with-private-key-test/ethereumjs-tx.js linguist-vendored linguist-generated`