fixed conflict

1 files changed, 66 insertions, 0 deletions

diff --git a/node_modules/express-messages/package.json b/node_modules/express-messages/package.json
new file mode 100644
index 0000000..019eb11
--- /dev/null
+++ b/node_modules/express-messages/package.json
@@ -0,0 +1,66 @@
+{
+  "name": "express-messages",
+  "description": "Express flash notification message rendering",
+  "version": "1.0.1",
+  "author": {
+    "name": "TJ Holowaychuk",
+    "email": "tj@vision-media.ca"
+  },
+  "keywords": [
+    "express"
+  ],
+  "main": "index.js",
+  "devDependencies": {
+    "connect-flash": "^0.1.1",
+    "ejs": "^2.3.1",
+    "express": "^4.13.0",
+    "express-session": "^1.11.3",
+    "supertest": "^1.0.1",
+    "tap-spec": "^4.0.2",
+    "tape": "^4.0.0"
+  },
+  "engines": {
+    "node": ">= 0.10.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/expressjs/express-messages.git"
+  },
+  "scripts": {
+    "test": "tape test/messages.js | node_modules/.bin/tap-spec"
+  },
+  "gitHead": "d1db1cbe95eb32917d5062796b99e9ea9f123ca8",
+  "bugs": {
+    "url": "https://github.com/expressjs/express-messages/issues"
+  },
+  "homepage": "https://github.com/expressjs/express-messages#readme",
+  "_id": "express-messages@1.0.1",
+  "_shasum": "9981a85a5d2b118c79fc33f52b41834ffee9685a",
+  "_from": "express-messages@latest",
+  "_npmVersion": "3.8.3",
+  "_nodeVersion": "5.10.1",
+  "_npmUser": {
+    "name": "artcommacode",
+    "email": "ryan@graphicalhouse.com"
+  },
+  "dist": {
+    "shasum": "9981a85a5d2b118c79fc33f52b41834ffee9685a",
+    "tarball": "https://registry.npmjs.org/express-messages/-/express-messages-1.0.1.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "artcommacode",
+      "email": "ryan@graphicalhouse.com"
+    },
+    {
+      "name": "tjholowaychuk",
+      "email": "tj@vision-media.ca"
+    }
+  ],
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/express-messages-1.0.1.tgz_1461573258084_0.4463885903824121"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/express-messages/-/express-messages-1.0.1.tgz"
+}