[adwaita-icon-theme: 198/410] unbreak the SVG

[William Jon McCann <mccann src gnome org>]

commit 2ed37e6f6add2678001901e78f23b11de5d1ea6c
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri Jul 15 17:20:01 2011 +0200

    unbreak the SVG

 src/gnome-stencils.svg |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-stencils.svg b/src/gnome-stencils.svg
index 9b45eae..d3e0125 100644
--- a/src/gnome-stencils.svg
+++ b/src/gnome-stencils.svg
@@ -42,13 +42,8 @@
      id="namedview88"
      showgrid="false"
      inkscape:zoom="1"
-<<<<<<< HEAD
      inkscape:cx="107.17958"
      inkscape:cy="-241.62729"
-=======
-     inkscape:cx="26.179579"
-     inkscape:cy="-441.62729"
->>>>>>> Flipping icons
      inkscape:window-x="1796"
      inkscape:window-y="96"
      inkscape:window-maximized="0"