Projects >> spring-data-mongodb >>1bc042666ab196aeb81c3eda1bad22b852e2db87

Chunk
Conflicting content 
import java.util.List;
import java.util.Map;

<<<<<<< HEAD
import org.junit.After;
=======
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
>>>>>>> 057eeb101c8d7b70d348b611da821c03f09e067b
import org.junit.Before;
import org.junit.Test;
import org.slf4j.LoggerFactory;
Solution content 
import java.util.List;
import java.util.Map;

import com.mongodb.Mongo;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
File
MappingTests.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
  MongoTemplate template;

  @Before
<<<<<<< HEAD
  public void setUp() throws InterruptedException {
=======
  public void setUp() throws Exception {
    Mongo mongo = new Mongo();
    mongo.getDB("database").getCollection("person").drop();
>>>>>>> 057eeb101c8d7b70d348b611da821c03f09e067b
    applicationContext = new ClassPathXmlApplicationContext("/mapping.xml");
    template = applicationContext.getBean(MongoTemplate.class);
  }
Solution content 
  MongoTemplate template;
  MongoMappingContext mappingContext;

  @Before
  public void setUp() throws Exception {
    Mongo mongo = new Mongo();
    mongo.getDB("database").getCollection("person").drop();
    applicationContext = new ClassPathXmlApplicationContext("/mapping.xml");
    template = applicationContext.getBean(MongoTemplate.class);
File
MappingTests.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Variable