https://github.com/firtadokei/codeigniter-vitejs

Author: mihatorikei

README.md

@@ -1,5 +1,9 @@
 <div align="center">
+<<<<<<< HEAD
 	<img width="180px" src="src/logo.svg">
+=======
+	<img width="200px" src="src/logo.svg">
+>>>>>>> d2d4e2e3e320c88ef9097ce865f6547e504dfb6d
   	<h1>Codeigniter viteJs</h1>
   	<p>Vitejs Integration For Codeigniter4</p>
 	<hr />

composer.json

@@ -5,8 +5,11 @@
     "type": "library",
     "homepage": "https://github.com/firtadokei/codeigniter-vitejs",
     "keywords": [
+<<<<<<< HEAD
         "codeigniter",
         "codeigniter4",
+=======
+>>>>>>> d2d4e2e3e320c88ef9097ce865f6547e504dfb6d
         "codeigniter-viteJs",
         "codeigniter-vueJs",
         "codeigniter-reactJs",
@@ -29,4 +32,8 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> d2d4e2e3e320c88ef9097ce865f6547e504dfb6d

src/Config/svelte/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "codeigniter-vite-svelte-starter",
+  "name": "codeignitervite-svelte",
   "private": true,
   "version": "0.0.0",
   "scripts": {