Local edit of SQL Enum
Conflict resolution

Conflicts:
	src/SQLEnum.java