| Chunk |
|---|
| Conflicting content |
|---|
import java.io.InputStream; import java.net.URL; import java.text.SimpleDateFormat; <<<<<<< HEAD import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; ======= import java.util.*; >>>>>>> ce4b25f9648435bfd5ac9fa2e2be859e82b6527a import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; |
| Solution content |
|---|
import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; |
| File |
|---|
| ProcessInstanceAdminManagerPane.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |