whoops

Flow-Works · Sep 30, 2024 · 57303fd · 57303fd
1 parent 75f3861
commit 57303fd
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -14,11 +14,8 @@ import Module from "node:module";
 
 const publicPath = "./public";
 
-<<<<<<< HEAD
+
 const port = process.env.PORT || 8000;
-=======
-const port = process.env.PORT || 8080;
->>>>>>> 8404ab4fdef8eab41cae782fcf9d7e7a9bda4bcd
 
 const app = express();
 const server = createServer(app);