Merge branch 'master' into chaz

[chaz/openbox] / openbox / keytree.h

diff --git a/openbox/keytree.h b/openbox/keytree.h
index 391cb154fb91a5cc61c2f12ac8771dd8a17b91b3..66edc3c7faf0af58ba57827370debed953d6c74d 100644 (file)
--- a/openbox/keytree.h
+++ b/openbox/keytree.h
@@ -42,5 +42,4 @@ void tree_assimilate(KeyBindingTree *node);
 KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
 gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
 
-
 #endif