From da5ae0ef10ce5ef8cb22c129fc071f6598d6764a Mon Sep 17 00:00:00 2001
From: Critical Sool <164774099+criticalsool@users.noreply.github.com>
Date: Sat, 29 Nov 2025 15:32:42 +0100
Subject: [PATCH] Update server.js

---
 backend/server.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/server.js b/backend/server.js
index fa6d133b..aaa89c75 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -323,8 +323,6 @@ async function initializeRateLimiters() {
 }
 
 // Note: Rate limiters will be initialized after database connection
-
-<<<<<<< HEAD
 app.use(express.json({ limit: '10gb' }));
 app.use(express.urlencoded({ extended: true, limit: '10gb' }));