Skip to content

Commit

Permalink
merge conflict be gone
Browse files Browse the repository at this point in the history
  • Loading branch information
@Skies-Of-Blue
Skies-Of-Blue committed Jun 12, 2024
1 parent 287a2c4 commit beacdc7
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions shiptest.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1964,6 +1964,7 @@
#include "code\modules\clothing\ears\_ears.dm"
#include "code\modules\clothing\factions\clip.dm"
#include "code\modules\clothing\factions\gezena.dm"
#include "code\modules\clothing\factions\hardliners.dm"
#include "code\modules\clothing\factions\nanotrasen.dm"
#include "code\modules\clothing\factions\ngr.dm"
#include "code\modules\clothing\factions\suns.dm"
Expand Down

0 comments on commit beacdc7

Please sign in to comment.