fix github wtf lines

OrJDev · Nov 18, 2022 · cd72d1c · cd72d1c
1 parent bcf2580
commit cd72d1c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/template/base/package.json b/template/base/package.json
@@ -22,13 +22,8 @@
     "solid-js": "^1.5.7",
     "solid-start": "^0.2.1",
     "undici": "5.11.0",
-<<<<<<< HEAD
     "zod": "^3.19.1",
     "dotenv": "^16.0.3"
-=======
-    "dotenv": "^16.0.3",
-    "zod": "^3.19.1"
->>>>>>> 88a4a00418f8cf9b23c66d8e4fdb215b8d0007fc
   },
   "engines": {
     "node": ">=16"

diff --git a/template/base/vite.config.ts b/template/base/vite.config.ts
@@ -1,15 +1,10 @@
 import solid from "solid-start/vite";
-import dotenv from "dotenv";
 import { defineConfig } from "vite";
 import dotenv from "dotenv";
 
 export default defineConfig(() => {
   dotenv.config();
   return {
-<<<<<<< HEAD
     plugins: [solid({ ssr: true })],
-=======
-    plugins: [solid({ ssr: false })],
->>>>>>> 88a4a00418f8cf9b23c66d8e4fdb215b8d0007fc
   };
 });