diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-07-01 05:56:10 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-07-01 05:56:10 +0800 |
| commit | 1b1bb92fd34343d2cec03d68e2b12de15934ebc2 (patch) | |
| tree | e8e0ad67370646bfcacb280e940fa76033c92a9d /.gitattributes | |
| parent | 42cd0b69e76537022c7766cae430e496371818b6 (diff) | |
| parent | 213c84336e1083f4abe278ac2f70c45124c6ab62 (diff) | |
| download | tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.gz tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.bz2 tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.lz tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.xz tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.zst tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.zip | |
Merge branch 'master' into compactLayout
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 212566614..a19ade077 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -* text=auto
\ No newline at end of file +CHANGELOG.md merge=union |