diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-25 07:44:25 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-25 07:44:25 +0800 |
| commit | 242456ba6af8d01049152b9b04197da94a43d8c8 (patch) | |
| tree | f4b1cbe2c165b0e7a9fbd0eb9c1df20646196c4b /LICENSE | |
| parent | 98d8275743344826e81ee59ba7435ca75b43f2cd (diff) | |
| parent | 35ca7e83bdffe4dbf9efbcd161e9f80e5530c86a (diff) | |
| download | tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.gz tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.bz2 tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.lz tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.xz tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.tar.zst tangerine-wallet-browser-242456ba6af8d01049152b9b04197da94a43d8c8.zip | |
Resolve merge conflict.
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions