merge conflicts

This commit is contained in:
sudhansu
2019-03-23 16:25:40 -07:00
parent a0eabd34b0
commit 72cbd2b63b

View File

@ -48,4 +48,4 @@
<rule ref="rulesets/apex/quickstart.xml/EmptyStatementBlock" deprecated="true" />
<rule ref="rulesets/apex/quickstart.xml/OneDeclarationPerLine" deprecated="true" />
<rule ref="rulesets/apex/quickstart.xml/ApexDoc" deprecated="true" />
</ruleset>
</ruleset>