From 54bd177528be1fe0d8d2360fc71a105c77123404 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 23 Oct 2018 16:29:18 +0200
Subject: [PATCH] Minify JS after updating files

---
 update.bat | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/update.bat b/update.bat
index 4c2c1d84..46ef323f 100644
--- a/update.bat
+++ b/update.bat
@@ -4,11 +4,7 @@ echo Update Vitis App
 
 call utils/update_tree.bat
 
-<<<<<<< HEAD
 cd client/conf
-=======
-cd ../client/conf
->>>>>>> 7b0e04e0777792e9cf713c50f58351a7f721d3af
 call grunt
 
 pause
-- 
GitLab