From 880dd2b70697f1d6298f9cfde3c090a8635995d0 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Thu, 1 Nov 2018 14:45:15 -0700
Subject: [PATCH] Fix malformed korebuild lock file

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

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 80b15e473a..591cfd52ff 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 version:3.0.0-alpha1-20181004.7
 commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2
-=======
-version:2.2.0-preview2-20181004.6
-commithash:c04c4b2f5018632647f96210ab01876661302dac
->>>>>>> release/2.2