Merge pull request #15 from FRC830/fix/auto-build-master

CI/CD: Use correct branch name "master" instead of "main"
FRC830 · Feb 11, 2024 · e8cb0e8 · e8cb0e8
2 parents d7bbfcd + 9b2e52a
commit e8cb0e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,12 +3,12 @@
 name: CI
 
 # Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the main branch.
+# events but only for the master branch.
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

diff --git a/src/main/include/NeoDriveMotor.h b/src/main/include/NeoDriveMotor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <rev/CANSparkMAX.h>
+#include <rev/CANSparkMax.h>
 #include "Interfaces/SwerveDriveMotor.h"
 #include "units/velocity.h"