📦 fix merge conflict

Fcmam5 · Mar 18, 2020 · 0d16213 · 0d16213
2 parents bdbd944 + df2d1a3
commit 0d16213
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/examples/simple-express-app.js b/examples/simple-express-app.js
@@ -1,4 +1,5 @@
 const express = require('express');
+const bodyParser = require('body-parser');
 const responsePresenter = require('../src');
 
 const app = express();

diff --git a/package-lock.json b/package-lock.json