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

diff --git a/images/en/flow/ifelse.svg b/images/en/flow/ifelse.svg
index e40c65c..4c3df3a 100644
--- a/images/en/flow/ifelse.svg
+++ b/images/en/flow/ifelse.svg
@@ -29,15 +29,6 @@
   <path
      style="opacity:1;fill:url(#linearGradient3172);fill-opacity:1;stroke:#a97513;stroke-width:2;stroke-opacity:1"
      d="M 48,1 C 64,1 64.187817,1 64.187817,1 C 64.187817,1 67.093036,1.8126092 68.09137,2.6369032 C 69.004632,3.3909562 70.42005,6 70.42005,6 L 109,6 L 109,10.362744 C 109,10.362744 95.936038,11.968359 91.234146,14.580971 C 87.185598,16.830552 81.69394,20.427467 79.862644,24.586001 C 78.615904,27.417117 78.754707,32.093211 80.064747,34.895598 C 81.739279,38.477693 86.523166,41.68078 90.010223,43.545156 C 95.034158,46.231233 109,48.539891 109,48.539891 L 109,55 L 248.22226,55 L 252.38094,58.194148 L 255,62.579747 L 255,78 L 250.33564,78 C 250.33564,78 249.06474,75.448636 248.09231,74.705987 C 247.03194,73.896183 244.1269,73 244.1269,73 L 227,73 L 227,78 L 208,78 L 208,73 L 188.97779,73 C 188.97779,73 184.47819,75.568409 183,77 C 181.24507,78.699599 181.72398,77.650743 180,80.685997 L 180,105.40425 L 168,105.00825 L 168,79.979695 C 168,79.979695 165.78944,77.264522 164.79061,76.312183 C 163.65988,75.234075 160.55266,73 160.55266,73 L 142,73 L 142,78 L 123,78 L 123,73 L 103,73 C 103,73 99.222895,75.806066 98,77 C 96.517521,78.447372 95,82.347563 95,82.347563 L 95,105 L 75.204118,104.90405 C 75.204118,104.90405 73.24214,109.39853 71.78641,110.85394 C 70.354258,112.28578 65.932154,114.215 65.932154,114.215 L 47,114 L 47,119 L 28,119 L 28,114 L 10.924831,114 C 10.924831,114 6.228383,112.0831 4.6063009,110.53995 C 3.3197278,109.31599 1,105.54299 1,105.54299 L 1,10.796801 C 1,10.796801 3.196437,6.3426262 4.5939087,4.7968012 C 5.9621108,3.2833542 10.093909,1 10.093909,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" />
   <text
      style="font-size:12px;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans">
      <tspan
--
cgit v0.9.1