Projects >> atlas >>0be063e4fbf6ddf0ebed84007bc38837ce4d7f21

Chunk
Conflicting content 
package org.atlasapi.query;

import org.atlasapi.application.query.ApplicationConfigurationFetcher;
<<<<<<< HEAD
=======
import org.atlasapi.input.DefaultGsonModelReader;
import org.atlasapi.input.DelegatingModelTransformer;
import org.atlasapi.input.ItemModelTransformer;
import org.atlasapi.media.channel.ChannelGroupStore;
import org.atlasapi.media.channel.ChannelResolver;
>>>>>>> 2c2d6ca78da8d109f4592fd3054266ee93a16d3a
import org.atlasapi.media.entity.Broadcast;
import org.atlasapi.media.entity.Content;
import org.atlasapi.media.entity.ContentGroup;
Solution content 
package org.atlasapi.query;

import org.atlasapi.application.query.ApplicationConfigurationFetcher;
import org.atlasapi.input.DefaultGsonModelReader;
import org.atlasapi.input.DelegatingModelTransformer;
import org.atlasapi.input.ItemModelTransformer;
import org.atlasapi.media.entity.Broadcast;
import org.atlasapi.media.entity.Content;
import org.atlasapi.media.entity.ContentGroup;
File
QueryWebModule.java
Developer's decision
Combination
Kind of conflict
Import