resolve merge conflict

jenkinsci · Apr 12, 2015 · e501b18 · e501b18
1 parent 8239816
commit e501b18
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java
@@ -46,12 +46,7 @@ public void deleted(AbstractBuild r) {
     }
 
     public void started(AbstractBuild build) {
-/*
-        String changes = getChanges(build);
-        CauseAction cause = build.getAction(CauseAction.class);
-        AbstractProject<?, ?> project = build.getProject();
-        SlackNotifier.SlackJobProperty jobProperty = project.getProperty(SlackNotifier.SlackJobProperty.class);
-*/
+
         AbstractProject<?, ?> project = build.getProject();
         SlackNotifier.SlackJobProperty jobProperty = project.getProperty(SlackNotifier.SlackJobProperty.class);