summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek <dschmell91@gmail.com>2020-08-15 16:26:55 -0400
committerDerek <dschmell91@gmail.com>2020-08-15 16:26:55 -0400
commitff3b1d3fa31d8dbc226ae75e601ba0a9800252b0 (patch)
tree3ae1659327b42320a9c52f919647f11c92ab9823
parent6e4101c7d6b6b267f0a31b96bd14c97546c130e7 (diff)
Revert "Undo build.yaml changles"
This reverts commit ce7d7cd51d35bf22cf92a3765e021c10b583c587.
-rw-r--r--.github/workflows/build.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8bddf6..5eb7971 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