From 5c9c76055ebf61b3a551095ccd64376eafb1f05f Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Wed, 5 Jun 2019 13:19:37 -0700
Subject: [PATCH] merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 scripts/mk_win_dist.cmd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/mk_win_dist.cmd b/scripts/mk_win_dist.cmd
index c959b134c..66b9747ed 100644
--- a/scripts/mk_win_dist.cmd
+++ b/scripts/mk_win_dist.cmd
@@ -6,7 +6,6 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliar
 
 python scripts\mk_win_dist.py --x86-only --dotnet-key=$(Agent.TempDirectory)\z3.snk
 
-<<<<<<< HEAD
 xcopy dist\*.zip bin\nightly\* /y
 
 cd bin\nightly
@@ -16,8 +15,4 @@ git add *.zip
 git commit -s -a -m "nightly Windows"
 
 git push
-=======
-
-
->>>>>>> cdad6f3f977cd32c77909073ddba935e4ae2ae37