Projects >> UniversalMediaServer >>24fb4c9bb8685d47f528d1e46d01593e5b12c0b3

Chunk
Conflicting content 
		}

		File convertedSubs;
<<<<<<< HEAD
		if (applyFontConfig || isEmbeddedSource || is3D) {
			convertedSubs = new File(subsPath.getAbsolutePath() + File.separator + basename + "_ID" + params.sid.getId() + "_" + modId + ".ass");
=======
		if (applyFontConfig || isEmbeddedSource || params.sid.getType() != subtitleType) {
			convertedSubs = new File(subsPath.getAbsolutePath() + File.separator + basename + "_ID" + params.sid.getId() + "_" + modId + "." + subtitleType.getExtension());
>>>>>>> 9f1d6e5e7e2e362388e97befa4615efc8254fdbb
		} else {
			String tmp = params.sid.getExternalFile().getName().replaceAll("[<>:\"\\\\/|?*+\\[\\]\n\r ']", "").trim();
			convertedSubs = new File(subsPath.getAbsolutePath() + File.separator + modId + "_" + tmp);
Solution content 
		}

		File convertedSubs;
		if (applyFontConfig || isEmbeddedSource || is3D || params.sid.getType() != subtitleType) {
			convertedSubs = new File(subsPath.getAbsolutePath() + File.separator + basename + "_ID" + params.sid.getId() + "_" + modId + "." + subtitleType.getExtension());
		} else {
			String tmp = params.sid.getExternalFile().getName().replaceAll("[<>:\"\\\\/|?*+\\[\\]\n\r ']", "").trim();
			convertedSubs = new File(subsPath.getAbsolutePath() + File.separator + modId + "_" + tmp);
File
FFMpegVideo.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable