resolve merge conflict in app.js

hack4impact-uiuc · Jan 12, 2021 · 4bb84d0 · 4bb84d0 · vercel · Jan 12, 2021
1 parent 8cf308d
commit 4bb84d0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/api/src/app.js b/api/src/app.js
@@ -30,11 +30,7 @@ mongoose.Promise = global.Promise;
 
 mongoose.connection
   .once('open', () => console.log('Connected to MongoLab instance.'))
-<<<<<<< HEAD
-  .on('error', error => console.log('Error connecting to MongoLab:', error));
-=======
   .on('error', (error) => console.log('Error connecting to MongoLab:', error));
->>>>>>> fb18f4ef1ef0b94d66fd7f4d2a499ece34a4bfd7
 
 app.use(helmet());
 app.use(cors());