| Chunk |
|---|
| Conflicting content |
|---|
*/
public Deck(ZipFile zip, Context ctx) throws IOException {
Enumeration extends ZipEntry> e = zip.entries();
<<<<<<< HEAD
frontSide = new ArrayList |
| Solution content |
|---|
*/
public Deck(ZipFile zip, Context ctx) throws IOException {
Enumeration extends ZipEntry> e = zip.entries();
frontSide = new ArrayList |
| File |
|---|
| Deck.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |