Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@irRegularGuy646
irRegularGuy646 committed Oct 5, 2023
1 parent 8e6dbfe commit 9f548f7
Showing 1 changed file with 0 additions and 0 deletions.
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
View file
Binary file not shown.

0 comments on commit 9f548f7

Please sign in to comment.