From dcd80f72687b9c1c6e9c67f2f9e8c8f31c92a7f9 Mon Sep 17 00:00:00 2001
From: rolux <rolux@pandora>
Date: Mon, 5 Jul 2010 19:05:31 +0200
Subject: [PATCH] merging changes

---
 build/js/ox.ui.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index 20aff34..4bccafe 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -4271,12 +4271,7 @@ requires
             );            
 
         function parseKeyboard(str) {
-<<<<<<< TREE
-            Ox.print("str", str, options)
             if (Ox.isObject(str)) return str; // fixme: this should not happen
-=======
-            if (Ox.isObject(str)) return str; // fixme: this should not happen
->>>>>>> MERGE-SOURCE
             var modifiers = str.split(" "),
                 key = modifiers.pop();
             return {