Skip to content

Commit

Permalink
pain
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Feb 16, 2023
1 parent c6155dc commit 9b394fd
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions citadel.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,12 +572,8 @@
#include "code\controllers\subsystem\sound\_sound.dm"
#include "code\controllers\subsystem\sound\channel_manager.dm"
#include "code\controllers\subsystem\sound\soundbyte_manager.dm"
<<<<<<< HEAD
#include "code\controllers\subsystem\ticker\_ticker.dm"
#include "code\controllers\subsystem\ticker\lobby.dm"
#include "code\datums\_datum.dm"
=======
>>>>>>> citrp/master
#include "code\datums\ai_law_sets.dm"
#include "code\datums\ai_laws.dm"
#include "code\datums\beam.dm"
Expand Down

0 comments on commit 9b394fd

Please sign in to comment.