fix: remove invalid xml code

Signed-off-by: Geert Eltink <[email protected]>
laminas · May 29, 2021 · 9825280 · 9825280
1 parent a9e5ce0
commit 9825280
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/LaminasCodingStandard/ruleset.xml b/src/LaminasCodingStandard/ruleset.xml
@@ -104,18 +104,13 @@
 
     <!-- The declare(strict_types=1) directive MUST be declared and be the
          first statement in a file. -->
-<<<<<<< HEAD
-    <rule ref="WebimpressCodingStandard.Files.DeclareStrictTypes">
-        <exclude name="WebimpressCodingStandard.Files.DeclareStrictTypes.BelowComment"/>
-=======
      <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
         <properties>
             <property name="declareOnFirstLine" value="false"/>
             <property name="linesCountBeforeDeclare" value="1"/>
             <property name="spacesCountAroundEqualsSign" value="0"/>
             <property name="linesCountAfterDeclare" value="1"/>
         </properties>
->>>>>>> 28aaa6c (feat: update to slevomat/coding-standard 7 for improved PHP 8 suport)
     </rule>
 
     <!-- 2.3 Lines -->