From ba5533b767dae8842e61a02a9931bde4d3cc40e4 Mon Sep 17 00:00:00 2001
From: Jose De Gouveia <dhgouveia@hotmail.com>
Date: Wed, 7 Sep 2016 17:29:12 +0200
Subject: [PATCH] added file field name into getFilename function in
 storage-handler

---
 test/upload-download.test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/upload-download.test.js b/test/upload-download.test.js
index 9e8901a..f538dd7 100644
--- a/test/upload-download.test.js
+++ b/test/upload-download.test.js
@@ -33,7 +33,6 @@ app.post('/custom/upload', function(req, res, next) {
   });
 
 });
->>>>>>> efe4e08... added file field name into getFilename function
 
 // expose a rest api
 app.use(loopback.rest());