Merge branch 'master' of github.com:AndrewMurrell/minak

Conflicts:
	src/us/minak/IMEView.java

1 files changed, 1 insertions, 4 deletions

diff --git a/src/us/minak/IMEView.java b/src/us/minak/IMEView.java
index b7b136b..724d69d 100644
--- a/src/us/minak/IMEView.java
+++ b/src/us/minak/IMEView.java
@@ -31,7 +31,7 @@ public class IMEView extends RelativeLayout {
 	private Button mShiftButton;
 	private ShiftState mShiftState = ShiftState.OFF;
 	private final Queue<Character> mSymbolsQueue = new LinkedList<Character>();
-	
+
 	private enum ShiftState {
 		OFF, ON, CAPS_LOCK
 	};
@@ -163,7 +163,4 @@ public class IMEView extends RelativeLayout {
 			throw new IllegalArgumentException();
 		}
 	}
-
-
-
 }