just misc merge cleanups

2013-09-04 23:07:39 +00:00 · 2013-09-04 23:07:39 +00:00 · 2a9b547f7b
commit 2a9b547f7b
parent 030ad1db5b
13 changed files with 73 additions and 34 deletions
--- a/Scripts/Engines/ConPVP/RulesetLayout.cs
+++ b/Scripts/Engines/ConPVP/RulesetLayout.cs
@ -344,7 +344,6 @@ namespace Server.Engines.ConPVP

 					if( !Core.AOS )
 					{
-
 						#region Mage 5x
 						Ruleset m5x = new Ruleset( m_Root );