| Chunk |
|---|
| Conflicting content |
|---|
}
for (File testDir : whitelist) {
<<<<<<< HEAD
if (FileUtils.contains(testDir, file)) {
=======
if (contains(testDir, file)) {
>>>>>>> 721a13547271c7af1629268d5e3b5e6361555270
return true;
}
} |
| Solution content |
|---|
}
for (File testDir : whitelist) {
if (FileUtils.contains(testDir, file)) {
return true;
}
} |
| File |
|---|
| Helpers.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |