Projects >> Kundera >>a5dcaeff7a700a117321a880837a8ee37847b8d6

Chunk
Conflicting content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

<<<<<<< HEAD
import com.impetus.kundera.Constants;
import com.impetus.kundera.client.ClientType;
=======
>>>>>>> aae3a152a29bcd313f5a24f70fa99937787b0407
import com.impetus.kundera.configure.schema.ColumnInfo;
import com.impetus.kundera.configure.schema.EmbeddedColumnInfo;
import com.impetus.kundera.configure.schema.SchemaGenerationException;
Solution content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.impetus.kundera.Constants;
import com.impetus.kundera.configure.schema.ColumnInfo;
import com.impetus.kundera.configure.schema.SchemaGenerationException;
File
CassandraSchemaManager.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    /**
     * Instantiates a new cassandra schema manager.
<<<<<<< HEAD
     * 
     * @param client
     *            the client
=======
     *
     * @param clientFactory the configured client clientFactory
>>>>>>> aae3a152a29bcd313f5a24f70fa99937787b0407
     */
    public CassandraSchemaManager(String clientFactory)
    {
Solution content 
    /**
     * Instantiates a new cassandra schema manager.
<<<<<<< HEAD
     * 
     * @param client
     *            the client
=======
     *
     * @param clientFactory the configured client clientFactory
>>>>>>> aae3a152a29bcd313f5a24f70fa99937787b0407
     */
    public CassandraSchemaManager(String clientFactory)
    {
File
CassandraSchemaManager.java
Developer's decision
Manual
Kind of conflict
Comment