Fixed merge conflicts

This commit is contained in:
AlexTheCoder 2018-01-07 06:22:01 -05:00 committed by Alexander Meech
parent 738253690e
commit 7902bacb04

View File

@ -354,4 +354,4 @@ public abstract class PunishPage extends ShopPageBase<Punish, PunishShop>
_pastPunishments.sort((a, b) -> Long.compare(b.GetTime(), a.GetTime()));
}
}
}