Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

asd

  • Loading branch information...
commit c38b3711358f099190301e9952c96acdefde8577 2 parents 8f90cd5 + 8cedd11
root authored
Showing with 29 additions and 0 deletions.
  1. +29 −0 app.js
View
29 app.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
// a
/**
* Module dependencies.
@@ -24,3 +25,31 @@ module.exports = app;
app.get('/', function (req, res) {
res.send('Bye11122222!');
});
+=======
+// 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.