Skip to content

Commit

Permalink
Fixing merge conflicts (again)
Browse files Browse the repository at this point in the history
  • Loading branch information
ShirouAjisai committed Jan 25, 2025
1 parent 328c3e0 commit cb2ee99
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Resources/ServerInfo/Guidebook/Mobs/Species.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<GuideEntityEmbed Entity="MobMoth" Caption="Moth Person"/>
<GuideEntityEmbed Entity="MobReptilian" Caption="Reptilian"/>
<GuideEntityEmbed Entity="MobSlimePerson" Caption="Slime Person"/>
<GuideEntityEmbed Entity="MobShadowkinDummy" Caption="Shadowkin"/>
<GuideEntityEmbed Entity="MobChitinid" Caption="Chitinid"/>
<GuideEntityEmbed Entity="MobShadowkinDummy" Caption="Shadowkin"/>
</Box>

# Parkstation specific species
Expand Down

0 comments on commit cb2ee99

Please sign in to comment.