Merge branch 'main' of https://github.com/realpxd/X-Clone

realpxd · Jan 26, 2024 · 9cbbd32 · 9cbbd32
2 parents f215f55 + 42a8091
commit 9cbbd32
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/x-clone-backend/index.js b/x-clone-backend/index.js
@@ -10,7 +10,10 @@ app.use(express.json())
 const port = process.env.PORT || 5000
 const uri = process.env.ATLAS_URI
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 42a8091ddfa56f48c408782c22d0eea1f8473aee
 const connectDB = async () => {
     try {
         await mongoose.connect(uri)