Skip to content

Commit 3e0dc98

Browse files
committed
fix issues with package.json and diff
1 parent ecdc12b commit 3e0dc98

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

packages/codecs/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
"name": "@journeyapps-labs/micro-codecs",
33
"main": "./dist/index",
44
"typings": "./dist/index",
5-
<<<<<<< Updated upstream
65
"version": "1.0.0",
7-
"repository": "https://github.com/journeyapps-labs/journey-micro",
8-
=======
9-
"version": "0.0.1",
106
"publishConfig": {
117
"registry": "https://registry.npmjs.org/",
128
"access": "public"
@@ -17,7 +13,6 @@
1713
},
1814
"author": "JOURNEYAPPS",
1915
"license": "Apache-2.0",
20-
>>>>>>> Stashed changes
2116
"files": [
2217
"dist/**"
2318
],

packages/errors/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
"name": "@journeyapps-labs/micro-errors",
33
"main": "./dist/index",
44
"typings": "./dist/index",
5-
<<<<<<< Updated upstream
65
"version": "1.0.0",
7-
"repository": "https://github.com/journeyapps-labs/journey-micro",
8-
=======
9-
"version": "0.0.1",
106
"publishConfig": {
117
"registry": "https://registry.npmjs.org/",
128
"access": "public"
@@ -17,7 +13,6 @@
1713
},
1814
"author": "JOURNEYAPPS",
1915
"license": "Apache-2.0",
20-
>>>>>>> Stashed changes
2116
"files": [
2217
"dist/**"
2318
],

packages/schema/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
"name": "@journeyapps-labs/micro-schema",
33
"main": "./dist/index",
44
"typings": "./dist/index",
5-
<<<<<<< Updated upstream
65
"version": "1.0.0",
7-
"repository": "https://github.com/journeyapps-labs/journey-micro",
8-
=======
9-
"version": "0.0.1",
106
"publishConfig": {
117
"registry": "https://registry.npmjs.org/",
128
"access": "public"
@@ -17,7 +13,6 @@
1713
},
1814
"author": "JOURNEYAPPS",
1915
"license": "Apache-2.0",
20-
>>>>>>> Stashed changes
2116
"scripts": {
2217
"test": "vitest"
2318
},

packages/streaming/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
"main": "./dist/index",
44
"browser": "./dist/web",
55
"typings": "./dist/index",
6-
<<<<<<< Updated upstream
76
"version": "1.0.0",
8-
"repository": "https://github.com/journeyapps-labs/journey-micro",
9-
=======
10-
"version": "0.0.1",
117
"publishConfig": {
128
"registry": "https://registry.npmjs.org/",
139
"access": "public"
@@ -18,7 +14,6 @@
1814
},
1915
"author": "JOURNEYAPPS",
2016
"license": "Apache-2.0",
21-
>>>>>>> Stashed changes
2217
"files": [
2318
"dist/**"
2419
],

0 commit comments

Comments
 (0)