Projects >> openengsb >>b4fe7988f462a7a1c84dd3d119c28e1d938a4964

Chunk
Conflicting content 
package org.openengsb.ui.admin.workflowEditor;

<<<<<<< HEAD
import static junit.framework.Assert.assertNull;
=======
>>>>>>> d0655ce66663d89ceb7bf4de91ea07251f99fd08
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertThat;
Solution content 
package org.openengsb.ui.admin.workflowEditor;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
File
WorkflowEditorTest.java
Developer's decision
Manual
Kind of conflict
Import