Fix malformed korebuild lock file

2018-11-01 14:45:15 -07:00 · 2018-11-01 14:45:15 -07:00 · 880dd2b706
parent b7162e23ca
commit 880dd2b706
1 changed files with 0 additions and 5 deletions
--- 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