From 7a2a6e26752b3f62375e8021d5f31a72f1ce3914 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Wed, 15 Aug 2012 22:46:23 -0400
Subject: [PATCH] MetaWindowGroup: Fix bad merge

I accidentally committed merge indicators: fix compilation.
---
 src/compositor/meta-window-group.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/compositor/meta-window-group.c b/src/compositor/meta-window-group.c
index c47cfafe6..d654a24a3 100644
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -186,13 +186,9 @@ meta_window_group_paint (ClutterActor *actor)
   ClutterActor *stage;
   cairo_rectangle_int_t visible_rect, unredirected_rect;
   GList *children, *l;
-<<<<<<< HEAD
-  gfloat group_x, group_y;
-=======
   int paint_x_origin, paint_y_origin;
   int actor_x_origin, actor_y_origin;
   int paint_x_offset, paint_y_offset;
->>>>>>> MetaWindowGroup: Handle painting inside a ClutterClone
 
   MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
   MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
@@ -226,8 +222,6 @@ meta_window_group_paint (ClutterActor *actor)
       unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect);
     }
 
-  clutter_actor_get_position (CLUTTER_ACTOR (window_group), &group_x, &group_y);
-
   /* We walk the list from top to bottom (opposite of painting order),
    * and subtract the opaque area of each window out of the visible
    * region that we pass to the windows below.