summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek <dschmell91@gmail.com>2020-08-15 16:21:38 -0400
committerDerek <dschmell91@gmail.com>2020-08-15 16:21:38 -0400
commitce7d7cd51d35bf22cf92a3765e021c10b583c587 (patch)
tree994a0172a9fefa9df92a8b9032ff6d86323771de
parentbb5eb51df743bd1c56c814c62f10d022c388df67 (diff)
Undo build.yaml changles
-rw-r--r--.github/workflows/build.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5eb7971..a8bddf6 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