Author: robin_listas
Date: 2015-09-14 17:03:26 +0200 (Mon, 14 Sep 2015)
New Revision: 92700
Modified:
trunk/yast/es/po/audit-laf.es.po
Log:
conflict solving
Modified: trunk/yast/es/po/audit-laf.es.po
===================================================================
--- trunk/yast/es/po/audit-laf.es.po 2015-09-14 14:46:25 UTC (rev 92699)
+++ trunk/yast/es/po/audit-laf.es.po 2015-09-14 15:03:26 UTC (rev 92700)
@@ -9,14 +9,13 @@
# Jordi Jaen Pallares