Undo build.yaml changles

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