Projects >> server >>4b6d21f7ad158b27845cfbfdb4e2b084bc65b4be

Chunk
Conflicting content 
<<<<<<< HEAD
	public static final String KEY_RECAPTACH_KEY_PUBLIC = "recaptcha_public_key";
	
	// Self-registration information.
	public static final String KEY_ALLOW_SELF_REGISTRATOIN = "self_registration_allowed";
	public static final String KEY_TERMS_OF_SERVICE = "terms_of_service";
=======
	public static final String KEY_ALLOW_SELF_REGISTRATION = "self_registration_allowed";
>>>>>>> dd6af1e2ed804868dc7b129bc456d0965245c022
	
	public static final String KEY_PUBLIC_CLASS_ID = "public_class_id";
Solution content 
	public static final String KEY_RECAPTACH_KEY_PUBLIC = "recaptcha_public_key";
	
	// Self-registration information.
	public static final String KEY_ALLOW_SELF_REGISTRATION = "self_registration_allowed";
	public static final String KEY_TERMS_OF_SERVICE = "terms_of_service";
	
	public static final String KEY_PUBLIC_CLASS_ID = "public_class_id";
File
PreferenceCache.java
Developer's decision
Combination
Kind of conflict
Attribute