Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

sad

  • Loading branch information...
commit 7c5022c3003eae20f112c65e27349a4101775cd4 1 parent c38b371
root authored
Showing with 3 additions and 31 deletions.
  1. +3 −31 app.js
34 app.js
View
@@ -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
+
Please sign in to comment.
Something went wrong with that request. Please try again.