fix conflict

Gruntfile.js

@@ -75,12 +75,9 @@ module.exports = function(grunt) {
                     ext: 'js,html',
                     nodeArgs: ['--debug'],
                     delayTime: 1,
-<<<<<<< HEAD
                     env: {
                         PORT: require('meanio').loadConfig().port
                     },
-=======
->>>>>>> a48d6db92223e76ae91b91a35c5615bbb24bb880
                     cwd: __dirname
                 }
             }
@@ -115,9 +112,9 @@ module.exports = function(grunt) {
 
     //Default task(s).
     if (process.env.NODE_ENV === 'production') {
-        grunt.registerTask('default', ['clean','cssmin', 'uglify', 'concurrent']);
+        grunt.registerTask('default', ['clean', 'cssmin', 'uglify', 'concurrent']);
     } else {
-        grunt.registerTask('default', ['clean','jshint', 'csslint', 'concurrent']);
+        grunt.registerTask('default', ['clean', 'jshint', 'csslint', 'concurrent']);
     }
 
     //Test task.
@@ -126,4 +123,4 @@ module.exports = function(grunt) {
     // For Heroku users only.
     // Docs: https://github.com/linnovate/mean/wiki/Deploying-on-Heroku
     grunt.registerTask('heroku:production', ['cssmin', 'uglify']);
-};
+};

server.js

@@ -3,37 +3,7 @@
 // Requires meanio
 var mean = require('meanio');
 
-<<<<<<< HEAD
 // Creates and serves mean application
 mean.serve({/*options placeholder*/}, function(app, config) {
 	console.log('running...');
-});
-=======
-/**
- * Main application entry file.
- * Please note that the order of loading is important.
- */
-
-// Initializing system variables
-var config = require('./server/config/config');
-var app = {};
-var db = mongoose.connect(config.db, function(err) {
-    if (err) {
-	console.error('Error:', err.message);
-	return console.error('**Could not connect to MongoDB. Please ensure mongod is running and restart MEAN app.**');
-    }
-
-    // Bootstrap Models, Dependencies, Routes and the app as an express app
-    app = require('./server/config/system/bootstrap')(passport, db);
-
-    // Start the app by listening on <port>, optional hostname
-    app.listen(config.port, config.hostname);
-    console.log('MEAN app started on port ' + config.port + ' (' + process.env.NODE_ENV + ')');
-
-    // Initializing logger
-    logger.init(app, passport, mongoose);
-});
-
-// Expose app
-exports = module.exports = app;
->>>>>>> a48d6db92223e76ae91b91a35c5615bbb24bb880
+});