[gtk+/gtk-2-24] quartz: my last commit had merge junk in it, sorry

[Michael Natterer <mitch src gnome org>]

commit 5a5d6d28c224c0837d9da12addfdf264d369fe56
Author: Michael Natterer <mitch gimp org>
Date:   Wed Sep 28 19:01:01 2011 +0200

    quartz: my last commit had merge junk in it, sorry

 gdk/quartz/gdkkeys-quartz.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
index ea67588..5b4a79a 100644
--- a/gdk/quartz/gdkkeys-quartz.c
+++ b/gdk/quartz/gdkkeys-quartz.c
@@ -420,15 +420,9 @@ maybe_update_keymap (void)
 		      /* Special-case shift-tab since GTK+ expects
 		       * GDK_ISO_Left_Tab for that.
 		       */
-<<<<<<< HEAD
 		      if (found && p[j] == GDK_Tab && modifiers[j] == shiftKey)
 			p[j] = GDK_ISO_Left_Tab;
-		      
-=======
-		      if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
-			p[j] = GDK_KEY_ISO_Left_Tab;
 
->>>>>>> 0a13dea... quartz: don't filter away directly encoded 24-bit UCS characters
 		      if (!found)
                         p[j] = gdk_unicode_to_keyval (uc);
 		    }