From 1a2c1fb8f60a62a11aaf9fae19ba0b7901372e5e Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Fri, 15 Jun 2018 22:09:49 +0900
Subject: [PATCH] Fix manipulate_windows_zip.js

---
 scripts/manipulate_windows_zip.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/manipulate_windows_zip.js b/scripts/manipulate_windows_zip.js
index 0676a81f..bc7ff948 100644
--- a/scripts/manipulate_windows_zip.js
+++ b/scripts/manipulate_windows_zip.js
@@ -4,11 +4,8 @@
 'use strict';
 
 const spawnSync = require('child_process').spawnSync;
-<<<<<<< HEAD
-
-=======
 const path = require('path');
->>>>>>> 5611556... Add extra app-updater-config.json into Windows zip
+
 const path7za = require('7zip-bin').path7za;
 
 const pkg = require('../src/package.json');
@@ -31,6 +28,6 @@ function disableInstallUpdate(zipPath) {
 }
 
 console.log('Manipulating 64-bit zip...');
-disableInstallUpdate(`release/${name}-${appVersion}-win.zip`);
+disableInstallUpdate(`release/${name}-${appVersion}-win-x64.zip`);
 console.log('Manipulating 32-bit zip...');
 disableInstallUpdate(`release/${name}-${appVersion}-win-ia32.zip`);