Revert "Undo build.yaml changles"

This reverts commit ce7d7cd51d.
4 years ago · ff3b1d3fa3
1 changed files with 0 additions and 4 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -16,10 +16,6 @@ jobs:
				@@ -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