From 2c245a5cab403032c5b02c7b7c5643d1c3c864f1 Mon Sep 17 00:00:00 2001 From: Guillermo Rauch Date: Sat, 21 Jan 2017 15:01:10 -0800 Subject: [PATCH] fix merge --- lib/get-files.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/get-files.js b/lib/get-files.js index 3ee2539..fa2ebdf 100644 --- a/lib/get-files.js +++ b/lib/get-files.js @@ -136,8 +136,6 @@ async function docker(path, { // convert all filenames into absolute paths const search = search_.map(file => asAbsolute(file, path)) - const dockerIgnore = await maybeRead(resolve(path, '.dockerignore'), null) - // compile list of ignored patterns and files const dockerIgnore = await maybeRead(resolve(path, '.dockerignore'), null)