Merge branch 'master' of https://github.com/donavon04/licensetrackerbackend

2025-01-18 08:40:57 -07:00 · 2024-11-29 08:46:54 -07:00 · 2024-11-29 08:46:54 -07:00 · 45155ffbb0
commit 45155ffbb0
parent 1a6bdeff09 dcf022ea68
1 changed files with 4 additions and 0 deletions
--- a/app.js
+++ b/app.js
@ -24,6 +24,10 @@ const pool = mariadb.createPool({
    db
 });

+<<<<<<< HEAD
+=======
+console.log(dbip + " is our database");
+>>>>>>> dcf022ea688e7bc79b407fd4e8e5ceb9644dcbca

 //Initialize pollrate variable
 let pollrate = "5000"; // 5 Seconds