Skip to content

Commit aa66743

Browse files
committed
Merge remote-tracking branch 'origin/master' into catbuffer-library
# Conflicts: # package-lock.json # package.json # src/infrastructure/transaction/CreateTransactionFromPayload.ts # src/model/transaction/AggregateTransaction.ts # src/model/transaction/TransferTransaction.ts
2 parents fea5ac1 + e6d5dc4 commit aa66743

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"build": "rm -rf dist/ && tsc && npm run e2econfigcopy",
1212
"test:cov": "nyc --reporter=lcov --reporter=text-summary npm t",
1313
"test:coveralls": "npm run test:cov | coveralls",
14-
"tslint": "tslint --project .",
1514
"coveralls-report": "cat ./coverage/lcov.info | coveralls"
1615
},
1716
"contributors": [
@@ -59,7 +58,7 @@
5958
},
6059
"dependencies": {
6160
"bluebird": "^3.5.5",
62-
"catbuffer": "0.0.5-SNAPSHOT",
61+
"catbuffer": "0.0.6-SNAPSHOT",
6362
"crypto-js": "^3.1.9-1",
6463
"js-joda": "^1.6.2",
6564
"js-sha256": "^0.9.0",

0 commit comments

Comments
 (0)