diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
| commit | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (patch) | |
| tree | c79832d7077ab03e0afe0c322cb32b204865d8b5 /.gitignore | |
| parent | eeecee01540fbad50c4c463a3b1a54142a63f168 (diff) | |
| parent | 07ab613d4c647e3fe554bc06eab8cfb833315a88 (diff) | |
| download | tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.gz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.bz2 tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.lz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.xz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.zst tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.zip | |
fix conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index af86113fb..4ee0c1c62 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ temp .DS_Store app/.DS_Store +coverage/ dist builds/ disc/ |