IT/licensetrackerbackend
4
0
Fork 0
mirror of https://github.com/donavon04/licensetrackerbackend.git synced 2025-01-18 08:40:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Donavon McDowell 2024-11-29 08:48:04 -07:00
parent 45155ffbb0
commit b1fa4b6238
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app.js
View File

@ -24,10 +24,7 @@ const pool = mariadb.createPool({
db db
}); });
<<<<<<< HEAD
=======
console.log(dbip + " is our database"); console.log(dbip + " is our database");
>>>>>>> dcf022ea688e7bc79b407fd4e8e5ceb9644dcbca
//Initialize pollrate variable //Initialize pollrate variable
let pollrate = "5000"; // 5 Seconds let pollrate = "5000"; // 5 Seconds