Fix invalid import after resolving conflicts
This commit is contained in:
parent
0f77523137
commit
5e95ffce1d
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue