diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/keymaps/keyboard.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index c64c0ea512..9c6d88b810 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -607,5 +607,4 @@ <backspace>PreviousMenu</backspace> </keyboard> </MyTVSettings> ->>>>>>> merge pvr-testing2 svn rev 32591 into trunk </keymap> |