diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-27 14:32:12 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-27 14:32:12 +0800 |
| commit | cf14eb4043865e26e13009f813b71f80203bf847 (patch) | |
| tree | db1a4511ff4dab29c82940965223002202336bc6 /.eslintrc | |
| parent | 3a4744dec179d0845cd9a3c306a6318dd609f4bd (diff) | |
| parent | 7a8d0497324f6f05274e7ffeef828134cbf9c481 (diff) | |
| download | tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.tar tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.tar.gz tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.tar.bz2 tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.tar.lz tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.tar.xz tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.tar.zst tangerine-wallet-browser-cf14eb4043865e26e13009f813b71f80203bf847.zip | |
Merge branch 'master' into droppo-fix
Diffstat (limited to '.eslintrc')
| -rw-r--r-- | .eslintrc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -98,7 +98,7 @@ "no-obj-calls": 2, "no-octal": 2, "no-octal-escape": 2, - "no-path-concat": 2, + "no-path-concat": 1, "no-proto": 2, "no-redeclare": 2, "no-regex-spaces": 2, |