From d6a170fd1d0e5121e3fecfbb93d95d0ae4b36610 Mon Sep 17 00:00:00 2001
From: Sean S <sean@goforward.group>
Date: Wed, 27 Nov 2024 06:54:06 -0500
Subject: [PATCH 1/2] small stuff

---
 src/app/Builder/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/Builder/page.tsx b/src/app/Builder/page.tsx
index a51cb17..2864dec 100644
--- a/src/app/Builder/page.tsx
+++ b/src/app/Builder/page.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@/components/ui/button"
+import { Button } from "@components/ui/button"
 
 
 export default function BuilderPage() {

From 8226ef77f937178e10cf3aa0e9125c814d9fa377 Mon Sep 17 00:00:00 2001
From: Sean S <sean@goforward.group>
Date: Wed, 27 Nov 2024 14:16:34 -0500
Subject: [PATCH 2/2] nothing major

---
 package-lock.json        | 26 ++++++++++++++++----------
 src/app/Builder/page.tsx |  4 ----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5e503e8..f4b3044 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "balistics-builder",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "balistics-builder",
-      "version": "0.1.0",
+      "version": "0.2.0",
       "dependencies": {
         "@chakra-ui/next-js": "^2.4.2",
         "@chakra-ui/react": "^3.1.2",
@@ -20,7 +20,6 @@
         "@mui/styles": "^6.1.7",
         "@mui/system": "^6.1.7",
         "@mui/x-data-grid": "^7.22.2",
-        "@prisma/client": "^5.22.0",
         "@radix-ui/react-slot": "^1.1.0",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.1",
@@ -49,7 +48,6 @@
         "eslint": "^8",
         "eslint-config-next": "15.0.3",
         "postcss": "^8",
-        "prisma": "^5.22.0",
         "tailwindcss": "^3.4.15",
         "tsx": "^4.19.2",
         "typescript": "^5.6.3"
@@ -2687,6 +2685,8 @@
       "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.22.0.tgz",
       "integrity": "sha512-M0SVXfyHnQREBKxCgyo7sffrKttwE6R8PMq330MIUF0pTwjUhLbW84pFDlf06B27XyCR++VtjugEnIHdr07SVA==",
       "hasInstallScript": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=16.13"
       },
@@ -2703,14 +2703,16 @@
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz",
       "integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==",
-      "devOptional": true
+      "optional": true,
+      "peer": true
     },
     "node_modules/@prisma/engines": {
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.22.0.tgz",
       "integrity": "sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==",
-      "devOptional": true,
       "hasInstallScript": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@prisma/debug": "5.22.0",
         "@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
@@ -2722,13 +2724,15 @@
       "version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
       "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz",
       "integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==",
-      "devOptional": true
+      "optional": true,
+      "peer": true
     },
     "node_modules/@prisma/fetch-engine": {
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz",
       "integrity": "sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==",
-      "devOptional": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@prisma/debug": "5.22.0",
         "@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
@@ -2739,7 +2743,8 @@
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.22.0.tgz",
       "integrity": "sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==",
-      "devOptional": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@prisma/debug": "5.22.0"
       }
@@ -8305,8 +8310,9 @@
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.22.0.tgz",
       "integrity": "sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==",
-      "devOptional": true,
       "hasInstallScript": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@prisma/engines": "5.22.0"
       },
diff --git a/src/app/Builder/page.tsx b/src/app/Builder/page.tsx
index 0f33f66..c55057f 100644
--- a/src/app/Builder/page.tsx
+++ b/src/app/Builder/page.tsx
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import { Button } from "@components/ui/button"
-=======
 import { Button } from "src/components/ui/button";
->>>>>>> 2454b1dc14659dae1bc827566b8c071e89ce3ac5
 
 
 export default function BuilderPage() {