Fixed merge conflict

2025-01-18 00:30:57 -07:00 · 2024-11-29 08:48:04 -07:00 · 2024-11-29 08:48:04 -07:00 · b1fa4b6238
commit b1fa4b6238
parent 45155ffbb0
1 changed files with 0 additions and 3 deletions
--- 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