From 23783e4dba7c3ad8b7bf4ca60eb02f1c151e50a2 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Mon, 30 Jul 2018 13:59:06 -0700
Subject: [PATCH] Fix korebuild-lock.txt

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

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 5f8b0b813f..1e75dc3a23 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 version:3.0.0-alpha1-10015
 commithash:3f36e5c2f061712f76f2766c435d2555681d5c55
-=======
-version:2.2.0-preview1-17102
-commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9
->>>>>>> merge/release/2.2-to-master