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/myblocks/stack2.svg')

diff --git a/images/en/myblocks/stack2.svg b/images/en/myblocks/stack2.svg
index 3912ad6..04ac380 100644
--- a/images/en/myblocks/stack2.svg
+++ b/images/en/myblocks/stack2.svg
@@ -29,29 +29,11 @@
   <path
      style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#c0a000;stroke-width:2;stroke-opacity:1"
      d="M 48,1 C 64,1 64,1 64,1 C 64,1 68.131798,3.4865526 69.5,5 C 70.897472,6.5458243 73,11 73,11 L 73,30 C 73,30 70.78295,33.693654 69.5,35 C 68.07044,36.455629 64,39 64,39 L 47,39 L 47,39 L 47,43 L 27,43 L 27,39 L 10,39 C 10,39 5.9295605,36.455629 4.5,35 C 3.2170498,33.693654 1,30 1,30 L 1,11 C 1,11 3.1025283,6.5458243 4.5,5 C 5.8682021,3.4865526 10,1 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:#606000;stroke-width:1;stroke-opacity:1"
-     d="M 10.5,39.5 L 26.5,39.5" />
-  <path
-     style="fill:none;stroke:#606000;stroke-width:1;stroke-opacity:1"
-     d="M 47.5,39.5 L 63.5,39.5" />
-  <path
-     style="fill:none;stroke:#606000;stroke-width:1;stroke-opacity:1"
-     d="M 26.5,43.5 L 47.5,43.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
        x="37"
        y="26"
-       style="font-size:18px;">stack2</tspan>
+       style="font-size:18px;">action2</tspan>
   </text>
 </svg>
--
cgit v0.9.1