Skip to content

Commit

Permalink
Merge branch 'master' into mag
Browse files Browse the repository at this point in the history
  • Loading branch information
prawny-boy authored Jan 22, 2024
2 parents 78bb6d9 + 2756dfb commit 62812cd
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 37 deletions.
5 changes: 0 additions & 5 deletions .editorconfig

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
python-version: 3.8
- name: Install wpiformat
run: pip3 install wpiformat==2023.36
run: pip3 install wpiformat==2024.31
- name: Run
run: wpiformat
- name: Check output
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2024.1.1"
id "edu.wpi.first.GradleRIO" version "2024.2.1"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand Down
2 changes: 0 additions & 2 deletions init.ps1

This file was deleted.

5 changes: 0 additions & 5 deletions init.sh

This file was deleted.

21 changes: 0 additions & 21 deletions wombat/LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion wombat/README.md

This file was deleted.

1 change: 0 additions & 1 deletion wombat/settings.gradle

This file was deleted.

0 comments on commit 62812cd

Please sign in to comment.