From 72cbd2b63bdd7df56f9d70b622128869c5e5e376 Mon Sep 17 00:00:00 2001
From: sudhansu <sudhansu@yelp.com>
Date: Sat, 23 Mar 2019 16:25:40 -0700
Subject: [PATCH] merge conflicts

---
 pmd-apex/src/main/resources/rulesets/apex/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
index 821fb07339..00b1054ad8 100644
--- a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
+++ b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
@@ -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>
\ No newline at end of file
+</ruleset>