lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad merge

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-20 16:14:25 +02:00
parent 5572364d2b
commit 9eb54ffb4b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/codesniffer/ruleset.xml
View File

@ -25,11 +25,7 @@
</rule> </rule>
<!-- The closing ?> tag MUST be omitted from files containing only PHP. --> <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
<<<<<<< HEAD
<rule ref="Zend.Files.ClosingTag"/> <rule ref="Zend.Files.ClosingTag"/>
=======
<!-- <rule ref="Zend.Files.ClosingTag"/> -->
>>>>>>> refs/remotes/origin/3.6
<!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> --> <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->