merge

Author: mar10

demo/index.html

@@ -47,14 +47,7 @@
 /* Optionally define a fixed width for menus */
 .ui-menu {
 	width: 220px;
-<<<<<<< HEAD
-=======
 }
-.ui-menu kbd {
-	float: right;
->>>>>>> FETCH_HEAD
-}
-
 /* Allow to use <kbd> elements inside the title to define shortcut hints. */
 .ui-menu kbd {
 	padding-left: 1em;