From 7451b337af3d58c741dd424bc99528b8f4e593d0 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 17:13:42 +0000
Subject: [PATCH] Update server.js

---
 server.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/server.js b/server.js
index 74ff1fa..c469ab8 100644
--- a/server.js
+++ b/server.js
@@ -1,25 +1,19 @@
 const express = require('express');
 const connectDB= require('./config/db')
-<<<<<<< HEAD
-=======
+
 const path = require('path')
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 const app = express();
 
 connectDB();
 
 app.use(express.json({extended:false}));
-<<<<<<< HEAD
-app.get('/',(req,res)=> res.send('API Running'));
-=======
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+
 
 app.use('/api/users', require('./routers/api/users'))
 app.use('/api/auth', require('./routers/api/auth'))
 app.use('/api/profile', require('./routers/api/profile'))
 app.use('/api/posts', require('./routers/api/posts'))
-<<<<<<< HEAD
-=======
+
 // Serve static assets in production
 if (process.env.NODE_ENV==='production'){
     app.use(express.static('client/build'));
@@ -27,7 +21,7 @@ if (process.env.NODE_ENV==='production'){
         res.sendFile(path.resolve(__dirname, 'client', 'build','index.html'))
     ])
 }
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+
 const PORT = process.env.PORT || 5000;
 
-app.listen(PORT,()=> console.log(`Server started on port ${PORT}`));
\ No newline at end of file
+app.listen(PORT,()=> console.log(`Server started on port ${PORT}`));