From 5e95ffce1d3211e5abea3b6d77b560b5bf15513a Mon Sep 17 00:00:00 2001 From: sbrassely Date: Fri, 2 Feb 2018 17:10:55 +0100 Subject: [PATCH] Fix invalid import after resolving conflicts --- .../gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java | 1 - .../gitlabjenkins/workflow/AddGitLabMergeRequestCommentStep.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/com/dabsquared/gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java b/src/main/java/com/dabsquared/gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java index 0642471..3874666 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java @@ -17,7 +17,6 @@ import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.export.ExportedBean; import com.dabsquared.gitlabjenkins.cause.GitLabWebHookCause; -import com.dabsquared.gitlabjenkins.gitlab.api.GitLabApi; import com.dabsquared.gitlabjenkins.gitlab.api.GitLabClient; import com.dabsquared.gitlabjenkins.gitlab.api.model.MergeRequest; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/com/dabsquared/gitlabjenkins/workflow/AddGitLabMergeRequestCommentStep.java b/src/main/java/com/dabsquared/gitlabjenkins/workflow/AddGitLabMergeRequestCommentStep.java index 381a384..e1ca0c4 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/workflow/AddGitLabMergeRequestCommentStep.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/workflow/AddGitLabMergeRequestCommentStep.java @@ -20,7 +20,6 @@ import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.export.ExportedBean; import com.dabsquared.gitlabjenkins.cause.GitLabWebHookCause; -import com.dabsquared.gitlabjenkins.gitlab.api.GitLabApi; import com.dabsquared.gitlabjenkins.gitlab.api.GitLabClient; import com.dabsquared.gitlabjenkins.gitlab.api.model.MergeRequest; import com.google.common.collect.ImmutableSet;