From c5c7f921faa4cf1730c2ef708a12d8d23f22809e Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Tue, 23 Oct 2018 10:56:45 -0700
Subject: [PATCH] Fix korebuild-lock.txt changes

---
 korebuild-lock.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index c8a05de2fc..27b605e3c6 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 version:3.0.0-alpha1-20181011.11
 commithash:f57aa8ddda0abdd74ada55853587bedb4f364065
-=======
-version:2.2.0-preview2-20181019.5
-commithash:84a1c04b13bd7127728fee91989db8f2f58c8781
->>>>>>> 61f1a70784dc0a32cf98f8ddd169c0293b0390ab