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

This reverts commit ce7d7cd51d35bf22cf92a3765e021c10b583c587.
---
 .github/workflows/build.yml | 4 ----
 1 file changed, 4 deletions(-)

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