# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1229465440 21600
# Node ID c7ff220bba9f508d7eafdaf70c657b8b06a3542e
# Parent  d6fd2964258c41620bda3b34ea35c94c34dd33c5
Bad merge on my end.

diff --git a/.elisp/textmate.el b/.elisp/textmate.el
--- a/.elisp/textmate.el
+++ b/.elisp/textmate.el
@@ -96,7 +96,7 @@
                                      (textmate-goto-symbol
                                       ,(kbd "A-T")   [(meta T)])
 				     (textmate-toggle-camel-case
-				      ,(kbd "C-_")   [(control _))))
+				      ,(kbd "C-_")   [(control _)])))
 
 (defvar *textmate-project-root-p*
   #'(lambda (coll) (or (member ".git" coll)