diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-01-31 03:13:02 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-01-31 03:13:02 +0800 |
| commit | a99e54330a10fbba9884ca6f9ccb3b075a3859a3 (patch) | |
| tree | 6db3451daeda4567557998c2a06dc82984d408f2 | |
| parent | e219772b2a25712f41fb819be36917d3b889201f (diff) | |
| parent | d004df56e38726ed7f1b775da33d8f37aae270db (diff) | |
| download | dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.tar dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.tar.gz dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.tar.bz2 dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.tar.lz dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.tar.xz dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.tar.zst dexon-sol-tools-a99e54330a10fbba9884ca6f9ccb3b075a3859a3.zip | |
Merge branch 'development' into feature/portal-ledger-support
* development:
Prettierignore package.json
Enable solidity syntax highlighting
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .prettierignore | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..52031de51 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sol linguist-language=Solidity diff --git a/.prettierignore b/.prettierignore index 79eeb6b8c..b2dee5c88 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,3 +2,4 @@ lib generated .nyc_output /packages/contracts/build/contracts +package.json |