Projects >> UniversalMediaServer >>a4188955b3095c88bba1ac2ca7b74be1a821bb33

Chunk
Conflicting content
	private static Set watchedEntries;
	private File[] dirs;
	private PmsConfiguration config;
<<<<<<< HEAD
	private static final FileUtils FILE_UTILS = FileUtils.getInstance();
=======
	@SuppressWarnings("unused")
>>>>>>> a14e670a3e50da7dd3b16c916249616e1a0da92b
	private static final Logger LOGGER = LoggerFactory.getLogger(MediaMonitor.class);

	public MediaMonitor(File[] dirs) {
Solution content
	private static Set watchedEntries;
	private File[] dirs;
	private PmsConfiguration config;
	private static final FileUtils FILE_UTILS = FileUtils.getInstance();

	@SuppressWarnings("unused")
	private static final Logger LOGGER = LoggerFactory.getLogger(MediaMonitor.class);

	public MediaMonitor(File[] dirs) {
File
MediaMonitor.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Method invocation