| Chunk |
|---|
| Conflicting content |
|---|
import java.util.ArrayList; import java.util.HashMap; <<<<<<< HEAD ======= import java.util.HashSet; import java.util.LinkedHashMap; >>>>>>> bbebf262241840044474ec6c022cf26e9fcaec18 import java.util.List; import java.util.Map; import java.util.Set; |
| Solution content |
|---|
import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; |
| File |
|---|
| Field.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |