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/flow/forever.svg')

diff --git a/images/en/flow/forever.svg b/images/en/flow/forever.svg
index edb3c32..9ec4515 100644
--- a/images/en/flow/forever.svg
+++ b/images/en/flow/forever.svg
@@ -29,18 +29,6 @@
   <path
      style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a97513;stroke-width:2;stroke-opacity:1"
      d="M 48,1 C 64,1 64.093909,1 64.093909,1 C 64.093909,1 66.999128,2.0158072 67.997462,2.8401016 C 68.910724,3.5941544 70.326142,6.0279188 70.326142,6.0279188 L 155,6.5 L 155.07138,18.133011 L 151.56154,18.128966 C 151.56154,18.128966 149.6815,15.956403 148.70907,15.213754 C 147.6487,14.40395 144.8236,13.04981 144.8236,13.04981 L 128.06091,13.315355 L 128.01396,18.088515 L 108.80964,18.166244 L 108.66878,12.891181 L 88.713197,13.250635 C 88.713197,13.250635 85.374202,16.120059 84,17.5 C 82.52486,18.981301 80.5,22.703046 80.5,22.703046 L 80.5,43.116751 L 10.526354,43.203199 C 10.526354,43.203199 5.8299058,41.169544 4.2078237,39.626397 C 2.9212506,38.402433 0.90609137,34.629442 0.90609137,34.629442 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:#ffffff;stroke-width:1;stroke-opacity:1"
-     d="M 25,7.5 L 49,7.5" />
-  <path
-     style="fill:none;stroke:#ffffff;stroke-width:0.91154099;stroke-opacity:1"
-     d="M 70.797356,7.5135155 L 153.56704,7.6019745" />
   <text
      style="font-size:12px;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans" >
      <tspan
--
cgit v0.9.1