Projects >> attendance >>18b2cc795efd7fa8e9d5e4ecf1445b9a7420ab7c

Chunk
Conflicting content 
		}
		

	public static enum Type {
		A, B, C, D;
<<<<<<< HEAD
		
		private String mDisplayString;

		private Type() {
			mDisplayString = this.toString();
		}

		private Type(String display_string) {
			mDisplayString = display_string;
		}
		
		public String getDisplayName() {
			return mDisplayString;
		public String getValue() {
			return name();
=======

		public boolean isA() {
			return this == A;
		}

		public boolean isB() {
			return this == B;
		}

		public boolean isC() {
			return this == C;
		}

		public boolean isD() {
			return this == D;
>>>>>>> e1d1eb6931824ca630ddcb908dd91f9cc663d84d
		}
	};
Solution content 
	public static enum Type {
		A, B, C, D;
		
		private String mDisplayString;

		private Type() {
			mDisplayString = this.toString();
		}

		private Type(String display_string) {
			mDisplayString = display_string;
		}
		
		public String getDisplayName() {
			return mDisplayString;
		}
		
		public String getValue() {
			return name();
		}
		public boolean isA() {
			return this == A;
		}

		public boolean isB() {
			return this == B;
		}

		public boolean isC() {
			return this == C;
		}

		public boolean isD() {
			return this == D;
		}
	};
File
Form.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method declaration
Method invocation
Method signature
Return statement