From 2273ae50a4cb370ede0ac1cf687f9610fafbd2f8 Mon Sep 17 00:00:00 2001
From: Levente Orban <leventeorb@gmail.com>
Date: Mon, 27 Oct 2025 11:02:32 +0100
Subject: [PATCH] feat: add pino logger for serverside

---
 package-lock.json                 | 8 --------
 package.json                      | 4 ----
 src/routes/create/+page.server.ts | 3 ---
 3 files changed, 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a97771d..3cb9084 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5182,19 +5182,11 @@
 			}
 		},
 		"node_modules/undici-types": {
-<<<<<<< HEAD
-			"version": "7.10.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
-			"integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
-			"license": "MIT",
-			"optional": true
-=======
 			"version": "7.16.0",
 			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
 			"integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
 			"devOptional": true,
 			"license": "MIT"
->>>>>>> 222c2ee (feat: add pino logger for serverside)
 		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
diff --git a/package.json b/package.json
index a9b977c..92a9718 100644
--- a/package.json
+++ b/package.json
@@ -22,12 +22,8 @@
 		"@tailwindcss/forms": "^0.5.9",
 		"@tailwindcss/typography": "^0.5.15",
 		"@tailwindcss/vite": "^4.0.0",
-<<<<<<< HEAD
-		"drizzle-kit": "^0.31.5",
-=======
 		"@types/node": "^24.9.1",
 		"drizzle-kit": "^0.31.4",
->>>>>>> 222c2ee (feat: add pino logger for serverside)
 		"eslint": "^9.18.0",
 		"eslint-config-prettier": "^10.0.1",
 		"eslint-plugin-svelte": "^3.0.0",
diff --git a/src/routes/create/+page.server.ts b/src/routes/create/+page.server.ts
index f642506..f07d424 100644
--- a/src/routes/create/+page.server.ts
+++ b/src/routes/create/+page.server.ts
@@ -2,11 +2,8 @@ import { database } from '$lib/database/db';
 import { events, inviteTokens } from '$lib/database/schema';
 import { fail, redirect } from '@sveltejs/kit';
 import type { Actions } from './$types';
-<<<<<<< HEAD
 import { generateInviteToken, calculateTokenExpiration } from '$lib/inviteTokenHelpers.js';
-=======
 import { logger } from '$lib/logger';
->>>>>>> 222c2ee (feat: add pino logger for serverside)
 
 // Generate a random URL-friendly ID
 function generateEventId(): string {