From ce7d7cd51d35bf22cf92a3765e021c10b583c587 Mon Sep 17 00:00:00 2001
From: Derek <dschmell91@gmail.com>
Date: Sat, 15 Aug 2020 16:21:38 -0400
Subject: [PATCH] Undo build.yaml changles

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5eb79716..a8bddf63 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,10 @@ jobs:
           - kyria_right
           - lily58_left
           - lily58_right
+<<<<<<< HEAD
+
+=======
+>>>>>>> parent of c3164f4... Updated build.yaml
         include:
           - board: proton_c
             shield: clueboard_california