cleanup

blacha · Jul 14, 2023 · 9912e3f · 9912e3f
1 parent e997f08
commit 9912e3f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 99 deletions.
diff --git a/packages/fs/package.json b/packages/fs/package.json
@@ -1,16 +1,6 @@
 {
  "name": "@chunkd/fs",
  "version": "10.0.9",
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
- "version": "10.0.9",
-=======
- "version": "10.0.0",
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
-=======
->>>>>>> 431690f (refactor: merge)
  "type": "module",
  "engines": {
  "node": ">=16.0.0"
@@ -26,36 +16,10 @@
  "license": "MIT",
  "scripts": {},
  "dependencies": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 216d49a (chore: release master (#1056))
- "@chunkd/core": "^10.3.0",
- "@chunkd/source-file": "^10.0.6",
- "@chunkd/source-http": "^10.1.2"
- },
- "optionalDependencies": {
- "@chunkd/source-aws": "^10.3.0",
- "@chunkd/source-google-cloud": "^10.0.4"
-<<<<<<< HEAD
-=======
-=======
- "@chunkd/source": "10.x.x",
- "@chunkd/source-file": "10.x.x",
- "@chunkd/source-memory": "10.x.x"
- },
- "devDependencies": {
- "@types/node": "^20.3.1"
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
- },
-=======
  "@chunkd/source": "^10.0.0",
  "@chunkd/source-file": "^10.0.6",
  "@chunkd/source-http": "^10.1.2"
  },
->>>>>>> 431690f (refactor: merge)
  "publishConfig": {
  "access": "public"
  },

diff --git a/packages/source-aws/package.json b/packages/source-aws/package.json
@@ -1,16 +1,6 @@
 {
  "name": "@chunkd/source-aws",
  "version": "10.3.0",
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
- "version": "10.3.0",
-=======
- "version": "10.0.3",
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
-=======
->>>>>>> 431690f (refactor: merge)
  "type": "module",
  "engines": {
  "node": ">=16.0.0"
@@ -24,22 +14,8 @@
  "types": "./build/src/index.d.ts",
  "author": "Blayne Chard",
  "license": "MIT",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "scripts": {},
- "dependencies": {
- "@chunkd/core": "^10.3.0"
-<<<<<<< HEAD
-=======
-=======
- "scripts": {
- "test": "node --test"
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
-=======
  "scripts": {
  "test": "node --test"
->>>>>>> 431690f (refactor: merge)
  },
  "dependencies": {
  "@aws-sdk/client-s3": "*",

diff --git a/packages/source-file/package.json b/packages/source-file/package.json
@@ -18,19 +18,7 @@
  "test": "node --test"
  },
  "dependencies": {
-<<<<<<< HEAD
-<<<<<<< HEAD
- "@chunkd/core": "^10.3.0"
-=======
-<<<<<<< HEAD
- "@chunkd/core": "^10.3.0"
-=======
  "@chunkd/source": "^10.0.0"
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
-=======
- "@chunkd/source": "^10.0.0"
->>>>>>> 58f862d (refactor: cleanup after merge)
  },
  "devDependencies": {
  "@types/node": "^18.0.0"

diff --git a/packages/source-http/package.json b/packages/source-http/package.json
@@ -14,16 +14,6 @@
  "types": "./build/src/index.d.ts",
  "author": "Blayne Chard",
  "license": "MIT",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "scripts": {},
- "dependencies": {
- "@chunkd/core": "^10.3.0"
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 431690f (refactor: merge)
  "scripts": {
  "test": "node --test"
  },
@@ -32,11 +22,6 @@
  },
  "devDependencies": {
  "@types/node": "^18.0.0"
-<<<<<<< HEAD
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
-=======
->>>>>>> 431690f (refactor: merge)
  },
  "publishConfig": {
  "access": "public"

diff --git a/packages/source-memory/package.json b/packages/source-memory/package.json
@@ -18,19 +18,7 @@
  "test": "node --test"
  },
  "dependencies": {
-<<<<<<< HEAD
-<<<<<<< HEAD
- "@chunkd/core": "^10.3.0"
-=======
-<<<<<<< HEAD
- "@chunkd/core": "^10.3.0"
-=======
  "@chunkd/source": "^10.0.0"
->>>>>>> 334c929 (build: stricter tsconfig)
->>>>>>> 216d49a (chore: release master (#1056))
-=======
- "@chunkd/source": "^10.0.0"
->>>>>>> 58f862d (refactor: cleanup after merge)
  },
  "devDependencies": {
  "@types/node": "^18.0.0"