Projects >> fluxtream-app >>49dcb088dcc0a3f0b67975564ba53a1f1362a64b

Chunk
Conflicting content 
import com.fluxtream.connectors.updaters.AbstractUpdater;
import com.fluxtream.connectors.updaters.UpdateInfo;
import com.fluxtream.domain.ApiKey;
<<<<<<< HEAD
import com.fluxtream.domain.Tag;
import com.fluxtream.services.ApiDataService;
import com.fluxtream.services.GuestService;
import com.fluxtream.services.JPADaoService;
import com.fluxtream.services.MetadataService;
=======
import com.fluxtream.domain.ChannelMapping;
import com.fluxtream.services.GuestService;
import com.fluxtream.services.JPADaoService;
import com.fluxtream.services.impl.BodyTrackHelper;
>>>>>>> e0e0a6f16d1adf5c129336e4ba5f2f70e779ecb8
import com.fluxtream.utils.JPAUtils;
import com.fluxtream.utils.Utils;
import net.sf.json.JSONArray;
Solution content 
import com.fluxtream.connectors.updaters.AbstractUpdater;
import com.fluxtream.connectors.updaters.UpdateInfo;
import com.fluxtream.domain.ApiKey;
import com.fluxtream.domain.Tag;
import com.fluxtream.services.ApiDataService;
import com.fluxtream.domain.ChannelMapping;
import com.fluxtream.services.GuestService;
import com.fluxtream.services.JPADaoService;
import com.fluxtream.services.MetadataService;
import com.fluxtream.services.impl.BodyTrackHelper;
import com.fluxtream.utils.JPAUtils;
import com.fluxtream.utils.Utils;
import net.sf.json.JSONArray;
File
FlickrUpdater.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public String[] defaultChannels() default {};

<<<<<<< HEAD
=======
    public Class settings() default EmptySettings.class;
    public Class bodytrackResponder() default DefaultBodytrackResponder.class;
>>>>>>> e0e0a6f16d1adf5c129336e4ba5f2f70e779ecb8

}
Solution content 
    public String[] defaultChannels() default {};

    public Class settings() default EmptySettings.class;

    public Class bodytrackResponder() default DefaultBodytrackResponder.class;

}
File
Updater.java
Developer's decision
Concatenation
Kind of conflict
Annotation declaration