| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.controller.command.worksheet; <<<<<<< HEAD import au.com.bytecode.opencsv.CSVReader; import edu.isi.karma.er.helper.CloneTableUtils; import edu.isi.karma.rep.*; import edu.isi.karma.rep.HNode.HNodeType; import edu.isi.karma.rep.Node.NodeStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; ======= >>>>>>> 1ffcc36c0813b23e323978d4a8aa4e33184ee403 import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; |
| Solution content |
|---|
package edu.isi.karma.controller.command.worksheet; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; |
| File |
|---|
| SplitColumnByDelimiter.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |