Projects >> xtext >>6ef7e96d39f05f59f97898f60cbe610ed4a0ce3d

Chunk
Conflicting content 
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
<<<<<<< HEAD
import com.intellij.compiler.impl.CompilerUtil;
import com.intellij.openapi.Disposable;
=======
>>>>>>> 5512ff14deee3a464537ec73d9a84a5688dde3b4
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
Solution content 
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
File
XtextAutoBuilder.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
      if (!_notEquals) {
        _and = false;
      } else {
<<<<<<< HEAD
        _and = (!this.disposed);
=======
        boolean _isDisposed = this.project.isDisposed();
        boolean _not_1 = (!_isDisposed);
        _and = _not_1;
>>>>>>> 5512ff14deee3a464537ec73d9a84a5688dde3b4
      }
      if (_and) {
        BuildEvent _buildEvent = new BuildEvent(file, type);
Solution content 
      if (!_notEquals) {
        _and_1 = false;
      } else {
        _and_1 = (!this.disposed);
      }
      if (_and_1) {
        BuildEvent _buildEvent = new BuildEvent(file, type);
File
XtextAutoBuilder.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable