Projects >> supersonic >>5399757c6d601722a9c288081314cc4b4e9b61eb

Chunk
Conflicting content 
import net.sourceforge.subsonic.domain.MediaFile;
import net.sourceforge.subsonic.domain.Player;
import net.sourceforge.subsonic.domain.UserSettings;
<<<<<<< HEAD
import net.sourceforge.subsonic.service.AdService;
import net.sourceforge.subsonic.service.MediaFileService;
import net.sourceforge.subsonic.service.RatingService;
=======
import net.sourceforge.subsonic.service.MusicFileService;
import net.sourceforge.subsonic.service.MusicInfoService;
>>>>>>> 3d920321a14708eee32916dbb67566d2ce813731
import net.sourceforge.subsonic.service.PlayerService;
import net.sourceforge.subsonic.service.SecurityService;
import net.sourceforge.subsonic.service.SettingsService;
Solution content 
import net.sourceforge.subsonic.domain.MediaFile;
import net.sourceforge.subsonic.domain.Player;
import net.sourceforge.subsonic.domain.UserSettings;
import net.sourceforge.subsonic.service.MediaFileService;
import net.sourceforge.subsonic.service.RatingService;
import net.sourceforge.subsonic.service.PlayerService;
import net.sourceforge.subsonic.service.SecurityService;
import net.sourceforge.subsonic.service.SettingsService;
File
MainController.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    private SecurityService securityService;
    private PlayerService playerService;
    private SettingsService settingsService;
<<<<<<< HEAD
    private RatingService ratingService;
    private MediaFileService mediaFileService;
    private AdService adService;
=======
    private MusicInfoService musicInfoService;
    private MusicFileService musicFileService;
>>>>>>> 3d920321a14708eee32916dbb67566d2ce813731

    @Override
    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
Solution content 
    private SecurityService securityService;
    private PlayerService playerService;
    private SettingsService settingsService;
    private RatingService ratingService;
    private MediaFileService mediaFileService;

    @Override
    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
File
MainController.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
        this.ratingService = ratingService;
    }

<<<<<<< HEAD
    public void setAdService(AdService adService) {
        this.adService = adService;
    }

    public void setMediaFileService(MediaFileService mediaFileService) {
        this.mediaFileService = mediaFileService;
    }
=======
>>>>>>> 3d920321a14708eee32916dbb67566d2ce813731
}
Solution content 
        this.ratingService = ratingService;
    }

}
File
MainController.java
Developer's decision
Version 2
Kind of conflict
Method declaration