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

diff --git a/images/es/myblocks/stack1.svg b/images/es/myblocks/stack1.svg
index 8cc3fb9..da12877 100644
--- a/images/es/myblocks/stack1.svg
+++ b/images/es/myblocks/stack1.svg
@@ -52,6 +52,6 @@
     <tspan
        x="37"
        y="26"
-       style="font-size:18px;">pila1</tspan>
+       style="font-size:18px;">acción 1</tspan>
   </text>
 </svg>
--
cgit v0.9.1