Resolving conflicts

Boris Kuzmic · Boris Kuzmic · commit 90661869acd5 · 2019-01-09T10:19:40.000+01:00
diff --git a/src/main/java/com/amihaiemil/docker/RtPlugin.java b/src/main/java/com/amihaiemil/docker/RtPlugin.java
@@ -35,7 +35,6 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.client.methods.HttpPost;
 
 /**
  * Runtime {@link Plugin}.
