| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
archives = getProperty("archives", ArchivesSet.DEFAULT.getName());
=======
archivesSet = getProperty("archivesset", ArchivesSet.DEFAULT.getName());
>>>>>>> 92550f5025b798ad439b1d24a9ad1763ffa40982
}
public File configdir; |
| Solution content |
|---|
}
}
archivesSet = getProperty("archivesset", ArchivesSet.DEFAULT.getName());
}
public File configdir; |
| File |
|---|
| PropertiesManager.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |