Merge remote-tracking branch 'origin/master'

Olicek · Jan 18, 2016 · d07aa7b · d07aa7b
2 parents 5007f2f + e283f59
commit d07aa7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/standards.xml b/standards.xml
@@ -6,7 +6,7 @@
     <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
     <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
     <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
-    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
+    <!-- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/> -->
 
     <!-- Files -->
     <rule ref="Generic.Files.ByteOrderMark"/>
@@ -91,4 +91,4 @@
         </properties>
     </rule>
 
-</ruleset>
+</ruleset>