Projects >> Wildbook >>05d6a00e217e42a3e940a5211842da038604c858

Chunk
Conflicting content 
import org.ecocean.tag.AcousticTag;
import org.ecocean.tag.MetalTag;
import org.ecocean.tag.SatelliteTag;
<<<<<<< HEAD

=======
>>>>>>> de3321f3722b709ce9814a4fa5aff9dde7f52e8b
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
Solution content 
import org.ecocean.tag.AcousticTag;
import org.ecocean.tag.MetalTag;
import org.ecocean.tag.SatelliteTag;

import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
File
EncounterForm.java
Developer's decision
Version 1
Kind of conflict
Blank