Projects >> UniversalMediaServer >>0b62d5368cfde2682e2fcbdc1a2d934dda023470

Chunk
Conflicting content 
 */
package net.pms;

<<<<<<< HEAD
import org.apache.commons.lang3.StringUtils;
=======
>>>>>>> b93436daed37e35e98b2192c546020395fbe9826
import java.util.Collections;
import java.util.List;
import java.util.Locale;
Solution content 
 */
package net.pms;

import java.util.Collections;
import java.util.List;
import java.util.Locale;
File
Messages.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		if (locale == null) {
			return getString(key);
		}
<<<<<<< HEAD
		if (lang.equalsIgnoreCase("en") || lang.equalsIgnoreCase("en-US") || lang.equalsIgnoreCase("en_US")) {
			return getDefaultString(key);
		} else {
			Locale l = new Locale(lang);
			ResourceBundle rb = ResourceBundle.getBundle(BUNDLE_NAME, l);
			if (rb == null) {
				rb = RESOURCE_BUNDLE;
			}
			return getString(key, rb);
=======
		// Selecting base bundle (en-US) for all English variants but British
		if (locale.getLanguage().toLowerCase(Locale.ENGLISH).equals("en") && !locale.getCountry().equals("GB")) {
			return getRootString(key);
		}
		ResourceBundle rb = ResourceBundle.getBundle(BUNDLE_NAME, locale);
		if (rb == null) {
			rb = ROOT_RESOURCE_BUNDLE;
>>>>>>> b93436daed37e35e98b2192c546020395fbe9826
		}
	}
Solution content 
		if (locale == null) {
			return getString(key);
		}
		// Selecting base bundle (en-US) for all English variants but British
		if (locale.getLanguage().toLowerCase(Locale.ENGLISH).equals("en") && !locale.getCountry().equals("GB")) {
			return getRootString(key);
		}
		ResourceBundle rb = ResourceBundle.getBundle(BUNDLE_NAME, locale);
		if (rb == null) {
			rb = ROOT_RESOURCE_BUNDLE;
		}
File
Messages.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
import java.util.*;
import java.util.List;
import java.util.Map.Entry;
<<<<<<< HEAD
import java.util.concurrent.CountDownLatch;
=======
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
>>>>>>> b93436daed37e35e98b2192c546020395fbe9826
import java.util.logging.LogManager;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Solution content 
import java.util.*;
import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.LogManager;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
File
PMS.java
Developer's decision
Concatenation
Kind of conflict
Import