From c1b96eaabc18d14183ae53681970ea62dff3920c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 6 Feb 2018 18:44:28 -0800
Subject: [PATCH] Update KoreBuild

This branch roughly tracks our preview2 stuff for now
---
 korebuild-lock.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 35a596eb91..d7ea9c33bf 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 version:2.1.0-preview2-15696
 commithash:85ae1301d1a2ff19aab6837cc657699ccca719b5
+=======
+version:2.1.0-preview2-15704
+commithash:21fdd9f5254226f407a2b4b3ef963693c2fd7998
+>>>>>>> Update KoreBuild