Projects >> openengsb >>36c100b29dbea839f458363b115f58c42009fb04

Chunk
Conflicting content 
 */
package org.openengsb.ui.web;

<<<<<<< HEAD
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

=======
>>>>>>> 8cc29243361e92a9fce6d58eb0e93436dec7c9af
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wicket.ajax.AjaxRequestTarget;
Solution content 
 */
package org.openengsb.ui.web;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wicket.ajax.AjaxRequestTarget;
File
TestClient.java
Developer's decision
Version 2
Kind of conflict
Import