fix merge conflict

pennlabs · Sep 29, 2023 · 22b3713 · 22b3713
1 parent 63dc443
commit 22b3713
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/PennMobile/src/main/res/drawable/trini.png b/PennMobile/src/main/res/drawable/trini.png