Skip to content

Commit 43aaefa

Browse files
committed
leftovers of a rebase
1 parent a526d49 commit 43aaefa

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

packages/blockchain/package.json

-6
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,5 @@
7575
"typedoc-plugin-markdown": "^2.2.17",
7676
"typescript": "^3.3.3333",
7777
"typestrict": "^1.0.2"
78-
<<<<<<< HEAD
79-
=======
80-
},
81-
"publishConfig": {
82-
"directory": "dist"
83-
>>>>>>> All siloed tests passing.
8478
}
8579
}

packages/common/package.json

-7
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,5 @@
7373
"email": "[email protected]"
7474
}
7575
],
76-
<<<<<<< HEAD
7776
"dependencies": {}
78-
=======
79-
"dependencies": {},
80-
"publishConfig": {
81-
"directory": "dist"
82-
}
83-
>>>>>>> All siloed tests passing.
8477
}

0 commit comments

Comments
 (0)