Fixed merge conflicts
This commit is contained in:
parent
738253690e
commit
7902bacb04
@ -354,4 +354,4 @@ public abstract class PunishPage extends ShopPageBase<Punish, PunishShop>
|
||||
|
||||
_pastPunishments.sort((a, b) -> Long.compare(b.GetTime(), a.GetTime()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user