From b1fa4b6238724ffa8947caf3b6d33fee7ce14069 Mon Sep 17 00:00:00 2001
From: donavon04 <dmcdowell@mpe.ca>
Date: Fri, 29 Nov 2024 08:48:04 -0700
Subject: [PATCH] Fixed merge conflict

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

diff --git a/app.js b/app.js
index b0e465b..16d9ad4 100644
--- a/app.js
+++ b/app.js
@@ -24,10 +24,7 @@ const pool = mariadb.createPool({
     db
 });
 
-<<<<<<< HEAD
-=======
 console.log(dbip + " is our database");
->>>>>>> dcf022ea688e7bc79b407fd4e8e5ceb9644dcbca
 
 //Initialize pollrate variable
 let pollrate = "5000"; // 5 Seconds