From af4de440167abe526fd9c311b9d4163c05e66283 Mon Sep 17 00:00:00 2001 From: Tzahi12345 Date: Mon, 30 Mar 2020 23:25:58 -0400 Subject: [PATCH] Further merge --- backend/app.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/app.js b/backend/app.js index 61bfc6b..760ac31 100644 --- a/backend/app.js +++ b/backend/app.js @@ -189,12 +189,9 @@ async function downloadUpdateFiles() { fs.removeSync(path.join(__dirname, 'public')); fs.mkdirSync(path.join(__dirname, 'public')); -<<<<<<< HEAD let replace_ignore_list = ['youtubedl-material/appdata/default.json', 'youtubedl-material/appdata/db.json'] -======= console.log(`Installing update ${tag}...`) ->>>>>>> 785306c59a8211b83a12b07f141a175e4d85dea8 // downloads new package.json and adds new public dir files from the downloaded zip fs.createReadStream(path.join(__dirname, 'youtubedl-material-latest-release.zip')).pipe(unzipper.Parse())