From 4bb84d03112749ad688166f8b595224b4e4f89ee Mon Sep 17 00:00:00 2001 From: Alice Fang Date: Tue, 12 Jan 2021 12:34:52 -0600 Subject: [PATCH] resolve merge conflict in app.js --- api/src/app.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/api/src/app.js b/api/src/app.js index 075840c..f68d976 100644 --- 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());