| Chunk |
|---|
| Conflicting content |
|---|
import java.awt.Graphics; import java.awt.image.BufferedImage; <<<<<<< HEAD public class Resource implements Comparable |
| Solution content |
|---|
import java.awt.Graphics; import java.awt.image.BufferedImage; public class Resource implements Comparable |
| File |
|---|
| Resource.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Class signature |
| Method invocation |