From 99f79cfc633294443b3d07bc126998d26c8cd798 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Wed, 23 Sep 2026 22:20:17 -0500
Subject: [PATCH] Fixed

---
 server/app.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/app.js b/server/app.js
index 09c12580b..68cc7b01d 100644
--- a/server/app.js
+++ b/server/app.js
@@ -194,7 +194,6 @@ export default async function createApp(vite) {
 		}
 	});
 
-<<<<<<< HEAD
 	//Edit Page
 	app.get('/edit/:id', asyncHandler(getBrew('edit')), asyncHandler(async(req, res, next)=>{
 		req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
@@ -329,7 +328,6 @@ export default async function createApp(vite) {
 
 		return next();
 	}));
-=======
 	// Create Event Stream source for pages to listen to
 	app.get('/stream', (req, res)=>{
 		res.writeHead(200, {
@@ -350,7 +348,6 @@ export default async function createApp(vite) {
 		Stream.emit('sendUpdate', 'initStream', { time: new Date });
 	}, 1000);
 
->>>>>>> master
 
 	// Local only
 	if(isLocalEnvironment){