From 8f715ebd18e6403bdcc81811660bf6cfba9e0adf Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Sun, 15 Feb 2009 18:17:06 +0000
Subject: Fix conflicts

---
(limited to 'images/en/pen/setshade.svg')

diff --git a/images/en/pen/setshade.svg b/images/en/pen/setshade.svg
index 7b49e28..0db8bc6 100644
--- a/images/en/pen/setshade.svg
+++ b/images/en/pen/setshade.svg
@@ -3,7 +3,7 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    width="87"
-   height="59"
+   height="60"
    version="1.0">
   <defs>
     <linearGradient
@@ -38,24 +38,6 @@
   <path
      style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#00a0a0;stroke-width:2;stroke-opacity:1"
      d="M 48,1 C 64,1 64,1 64,1 L 69.5,5 L 73,11 L 73,45 L 69.5,51 L 64,55 L 47,55 L 47,55 L 47,59 L 27,59 L 27,55 L 10,55 L 4.5,51 L 1,45 L 1,11 L 4.5,5 L 10,1 L 26,1 L 26,6 L 48,6 L 48,1 z" />
-  <path
-     style="fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1"
-     d="M 49,2.5 L 63,2.5" />
-  <path
-     style="fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1"
-     d="M 11,2.5 L 25,2.5" />
-  <path
-     style="fill:none;stroke:#006060;stroke-width:1;stroke-opacity:1"
-     d="M 10.5,55.5 L 26.5,55.5" />
-  <path
-     style="fill:none;stroke:#006060;stroke-width:1;stroke-opacity:1"
-     d="M 47.5,55.5 L 63.5,55.5" />
-  <path
-     style="fill:none;stroke:#006060;stroke-width:1;stroke-opacity:1"
-     d="M 26.5,59.5 L 47.5,59.5" />
-  <path
-     style="fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1"
-     d="M 25,7.5 L 49,7.5" />
   <text
      style="font-size:18px;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans">
     <tspan
--
cgit v0.9.1