From af4228c87879265419f70fa151dd6094a07307e9 Mon Sep 17 00:00:00 2001
From: Scott Rice <scottrice10@gmail.com>
Date: Thu, 5 Feb 2015 16:35:51 -0800
Subject: [PATCH] Undo adding second server.js

---
 client/app/search/search.html |  2 +-
 server.js                     | 29 -----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 server.js

diff --git a/client/app/search/search.html b/client/app/search/search.html
index 98acbfd..6037c2a 100644
--- a/client/app/search/search.html
+++ b/client/app/search/search.html
@@ -31,7 +31,7 @@ <h5 style="font-weight: bold" ng-bind="object.label"></h5>
                    reset-search-input="false"
                    style="width: 300px;"
                    on-select="fetchUsers($item)">
-          <ui-select-match placeholder="Search by user...">{{$select.selected}}</ui-select-match>
+          <ui-select-match placeholder="Search by language...">{{$select.selected}}</ui-select-match>
           <ui-select-choices repeat="entry in languages track by $index"
                              refresh="refreshTypeahead($select.search)"
                              refresh-delay="0">
diff --git a/server.js b/server.js
deleted file mode 100644
index c775095..0000000
--- a/server.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Main application file
- */
-
-'use strict';
-
-// Set default node environment to development
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-var express = require('express');
-var mongoose = require('mongoose');
-var config = require('./config/environment');
-
-// Connect to database
-mongoose.connect(config.mongo.uri, config.mongo.options);
-
-// Setup server
-var app = express();
-var server = require('http').createServer(app);
-require('./config/express')(app);
-require('./routes')(app);
-
-// Start server
-server.listen(config.port, config.ip, function () {
-  console.log('Express server listening on %d, in %s mode', config.port, app.get('env'));
-});
-
-// Expose app
-exports = module.exports = app;