From 8c00b4aecd57372802f8ab2e52f36db9eb7d1608 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Wed, 17 Oct 2007 16:10:23 +0000
Subject: [PATCH] Fallo en el fichero build.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/branches/D2007-DA5@48 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Build/Build.fbp5 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Build/Build.fbp5 b/Build/Build.fbp5
index defe384e..ba0168c7 100644
--- a/Build/Build.fbp5
+++ b/Build/Build.fbp5
@@ -2968,13 +2968,8 @@ Comments=
                 <Property MultiValue="0" name="ActionDescription" type="string">Contactos</Property>
                 <Property name="ActionTextColor" type="Cardinal">0</Property>
                 <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
-<<<<<<< .mine
                 <Property MultiValue="0" name="Description" type="string">Contactos</Property>
                 <Property name="Enabled" type="WordBool">True</Property>
-=======
-                <Property MultiValue="0" name="Description" type="string">Contactos</Property>
-                <Property name="Enabled" type="WordBool">False</Property>
->>>>>>> .r42
                 <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
                 <Property name="IgnoreFailure" type="WordBool">False</Property>
                 <Property name="IsAction" type="Boolean">True</Property>