diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-05-29 15:09:54 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-05-29 15:09:54 +0800 |
| commit | 62cc3b919c73b7726793808e3b9631dba41cef28 (patch) | |
| tree | 22c5f1728c56b09fa0e15e5e645c1f891224a6ee /.gitignore | |
| parent | 281b9eaa5d207d32ae38fbab25cbca83fe81efa1 (diff) | |
| parent | b897bdab79fe566ffc8c19c6ec9f1bb7260fa95e (diff) | |
| download | dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.tar dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.tar.gz dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.tar.bz2 dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.tar.lz dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.tar.xz dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.tar.zst dexon-sol-tools-62cc3b919c73b7726793808e3b9631dba41cef28.zip | |
Merge branch 'master' of github.com:0xProject/0x.js
# Conflicts:
# src/ts/0x.js.ts
# src/ts/utils/utils.ts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 3c6a1ab6f..4e1909a58 100644 --- a/.gitignore +++ b/.gitignore @@ -59,8 +59,6 @@ typings/ # built library using in commonjs module syntax lib -# built library using es6 module syntax to enable webpack and rollup tree shaking -lib-esm # UMD bundles that export the global variable _bundles |