| Chunk |
|---|
| Conflicting content |
|---|
*/ package net.sourceforge.seqware.pipeline.deciders; <<<<<<< HEAD ======= import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; >>>>>>> 891bfea2e5622bd03a6252e8ba3955a1d50d756d import io.seqware.Reports; import java.io.ByteArrayOutputStream; import java.io.File; |
| Solution content |
|---|
*/ package net.sourceforge.seqware.pipeline.deciders; import io.seqware.Reports; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import io.seqware.Reports; import java.io.ByteArrayOutputStream; import java.io.File; |
| File |
|---|
| BasicDeciderTest.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |