Projects >> UniversalMediaServer >>699f7a7b9e9be7fc96d6887a5855088fe2fb1030

Chunk
Conflicting content
		return getString(KEY_SCREEN_SIZE, "-1x-1");
	}

<<<<<<< HEAD
	public boolean isShowSplashScreen() {
		return getBoolean(KEY_SHOW_SPLASH_SCREEN, true);
	}

	public void setShowSplashScreen(boolean value) {
		configuration.setProperty(KEY_SHOW_SPLASH_SCREEN, value);
	}

=======
	public void setWindowExtendedState(int value) {
		configuration.setProperty(KEY_WINDOW_EXTENDED_STATE, value);
	}

	public int getWindowExtendedState() {
		return getInt(KEY_WINDOW_EXTENDED_STATE, Frame.NORMAL);
	}
>>>>>>> 2b599d4e97dd2ba8b98151c45dac841103d352df
}
Solution content
		return getString(KEY_SCREEN_SIZE, "-1x-1");
	}

	public void setWindowExtendedState(int value) {
		configuration.setProperty(KEY_WINDOW_EXTENDED_STATE, value);
	}

	public int getWindowExtendedState() {
		return getInt(KEY_WINDOW_EXTENDED_STATE, Frame.NORMAL);
	}

	public boolean isShowSplashScreen() {
		return getBoolean(KEY_SHOW_SPLASH_SCREEN, true);
	}

	public void setShowSplashScreen(boolean value) {
		configuration.setProperty(KEY_SHOW_SPLASH_SCREEN, value);
	}

}
File
PmsConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Method declaration