| Chunk |
|---|
| Conflicting content |
|---|
@Override
public boolean process(Set extends TypeElement> annotations, RoundEnvironment roundEnv) {
<<<<<<< HEAD
RealmVersionChecker updateChecker = new RealmVersionChecker(processingEnv);
updateChecker.executeRealmVersionUpdate();
=======
>>>>>>> 40377b8242ddaf54f4b2ddad9f626a0922dca998
for (Element classElement : roundEnv.getElementsAnnotatedWith(RealmClass.class)) {
String className;
String packageName; |
| Solution content |
|---|
@Override
public boolean process(Set extends TypeElement> annotations, RoundEnvironment roundEnv) {
RealmVersionChecker updateChecker = new RealmVersionChecker(processingEnv);
updateChecker.executeRealmVersionUpdate();
for (Element classElement : roundEnv.getElementsAnnotatedWith(RealmClass.class)) {
String className;
String packageName; |
| File |
|---|
| RealmProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |