Projects >> openengsb >>4edef258c9840a9fa611f603269aae1bb2dd010b

Chunk
Conflicting content 
import org.openengsb.core.api.xlink.model.XLinkTemplate;
import org.openengsb.core.api.xlink.model.XLinkToolView;
import org.openengsb.core.common.util.DefaultOsgiUtilsService;
<<<<<<< HEAD
import org.openengsb.core.common.xlink.ExampleObjectOrientedModel;
import org.openengsb.core.persistence.internal.CorePersistenceServiceBackend;
=======
>>>>>>> 87ba3ac0fa8bfb8d785a2d9a83f1189ef9f54f0f
import org.openengsb.core.persistence.internal.DefaultConfigPersistenceService;
import org.openengsb.core.test.AbstractOsgiMockServiceTest;
import org.openengsb.core.test.DummyConfigPersistenceService;
Solution content 
import org.openengsb.core.api.xlink.model.XLinkTemplate;
import org.openengsb.core.api.xlink.model.XLinkToolView;
import org.openengsb.core.common.util.DefaultOsgiUtilsService;
import org.openengsb.core.persistence.internal.DefaultConfigPersistenceService;
import org.openengsb.core.test.AbstractOsgiMockServiceTest;
import org.openengsb.core.test.DummyConfigPersistenceService;
File
ConnectorManagerTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        public Object nullMethod(Object o, String b) {
            return null;
        }
<<<<<<< HEAD

=======
        @Override
        public void commitModel(DummyModel model) {

        }
>>>>>>> 87ba3ac0fa8bfb8d785a2d9a83f1189ef9f54f0f
    }

    public interface TestInterface2 extends Domain {
Solution content 
        public Object nullMethod(Object o, String b) {
            return null;
        }
        
        @Override
        public void commitModel(DummyModel model) {

        }

    }

    public interface TestInterface2 extends Domain {
File
MethodUtilTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
=======
        @Override
        public void commitModel(DummyModel model) {

        }
>>>>>>> 87ba3ac0fa8bfb8d785a2d9a83f1189ef9f54f0f
    }

    public static enum TestEnum {
Solution content 
            return null;
        }

<<<<<<< HEAD
=======
        @Override
        public void commitModel(DummyModel model) {

        }
>>>>>>> master
    }

    public static enum TestEnum {
File
MethodUtilTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration