Merge with master again

samchon · Oct 11, 2024 · de0b0c0 · de0b0c0
1 parent f7529a8
commit de0b0c0
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/errors/package.json b/errors/package.json
@@ -32,10 +32,6 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
-<<<<<<< HEAD
     "typia": "../typia-7.0.0-dev.20241011.tgz"
-=======
-    "typia": "../typia-6.11.2.tgz"
->>>>>>> f1ad1a5748990c9ce0ab1d28de70ca83c5d76864
   }
 }
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "typia",
-<<<<<<< HEAD
   "version": "7.0.0-dev.20241011",
-=======
-  "version": "6.11.2",
->>>>>>> f1ad1a5748990c9ce0ab1d28de70ca83c5d76864
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/test-esm/package.json b/test-esm/package.json
@@ -36,10 +36,6 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-<<<<<<< HEAD
     "typia": "../typia-7.0.0-dev.20241011.tgz"
-=======
-    "typia": "../typia-6.11.2.tgz"
->>>>>>> f1ad1a5748990c9ce0ab1d28de70ca83c5d76864
   }
 }
diff --git a/test/package.json b/test/package.json
@@ -53,10 +53,6 @@
     "suppress-warnings": "^1.0.2",
     "tstl": "^3.0.0",
     "uuid": "^9.0.1",
-<<<<<<< HEAD
     "typia": "../typia-7.0.0-dev.20241011.tgz"
-=======
-    "typia": "../typia-6.11.2.tgz"
->>>>>>> f1ad1a5748990c9ce0ab1d28de70ca83c5d76864
   }
 }