sad

widewebworks · Jun 20, 2012 · 7c5022c · 7c5022c
1 parent c38b371
commit 7c5022c
Showing 1 changed file with 3 additions and 31 deletions.
diff --git a/app.js b/app.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 // a
 /**
  * Module dependencies.
@@ -10,7 +9,7 @@ var express = require('express');
  * Create app.
  */
 
-var app = express.createServer()
+var app = express.createServer();
 
 /**
  * Export app.
@@ -23,33 +22,6 @@ module.exports = app;
  */
 
 app.get('/', function (req, res) {
-  res.send('Bye11122222!');
+  res.send('OMGHI2U2!');
 });
-=======
-// a
-/**
- * Module dependencies.
- */
-
-var express = require('express');
-
-/**
- * Create app.
- */
-
-var app = express.createServer();
-
-/**
- * Export app.
- */
-
-module.exports = app;
-
-/**
- * Sample route.
- */
-
-app.get('/', function (req, res) {
-  res.send('OMGHI2U2!');
-});
->>>>>>> 8cedd11285d545e7da0c2d28b1f6559906eef223
+