Projects >> openengsb >>acc07ca0fcf430a754798d6cf86340c62380eba9

Chunk
Conflicting content 
import java.util.List;
import java.util.Map;

<<<<<<< HEAD
import org.openengsb.core.api.OpenEngSBService;
import org.openengsb.core.api.remote.CallRouter;
=======
>>>>>>> 021aee09fe62c38298b7c2b53ae6b459261b6e4d
import org.openengsb.core.api.remote.MethodCall;
import org.openengsb.core.api.remote.MethodReturn;
import org.openengsb.core.common.AbstractOpenEngSBService;
Solution content 
import java.util.List;
import java.util.Map;


import org.openengsb.core.api.OpenEngSBService;
import org.openengsb.core.api.remote.CallRouter;
import org.openengsb.core.api.remote.MethodCall;
import org.openengsb.core.api.remote.MethodReturn;
import org.openengsb.core.common.AbstractOpenEngSBService;
File
ProxyConnector.java
Developer's decision
Version 1
Kind of conflict
Import