This repository was archived by the owner on Oct 28, 2025. It is now read-only.
Commit 18bb548
committed
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# .idea/modules/TBA_Java_APIv3.iml
# .idea/modules/TBA_Java_APIv3.main.iml
# README.md
# src/main/java/com/thebluealliance/api/v3/Deserializer.java
# src/main/java/com/thebluealliance/api/v3/TBA.java
# src/main/java/com/thebluealliance/api/v3/models/Award.java
# src/main/java/com/thebluealliance/api/v3/models/DistrictRanking.java
# src/main/java/com/thebluealliance/api/v3/models/Event.java
# src/main/java/com/thebluealliance/api/v3/models/Media.java
# src/main/java/com/thebluealliance/api/v3/models/Ranking.java
# src/main/java/com/thebluealliance/api/v3/models/SimpleEvent.java
# src/main/java/com/thebluealliance/api/v3/models/SimpleMatch.java
# src/main/java/com/thebluealliance/api/v3/models/TeamEventStatus.java
# src/main/java/com/thebluealliance/api/v3/requests/APIResponse.java
# src/main/java/com/thebluealliance/api/v3/requests/DataRequest.java
# src/main/java/com/thebluealliance/api/v3/requests/EventRequest.java
# src/main/java/com/thebluealliance/api/v3/requests/TeamRequest.java0 file changed
0 commit comments