From: cascade <cascade@opencascade.com>
Date: Mon, 17 Nov 2003 21:43:22 +0000 (+0000)
Subject: Connect to BugMaster for details
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=d0b04f39dd3f3c9671dd1fab79c8c48427e5f625;p=occt-wok.git

Connect to BugMaster for details
---

diff --git a/src/WOKTclLib/config.h b/src/WOKTclLib/config.h
index 705ddde..49c924e 100755
--- a/src/WOKTclLib/config.h
+++ b/src/WOKTclLib/config.h
@@ -1,12 +1,5 @@
-<<<<<<<<<<<<<< variant A
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
->>>>>>>>>>>>>> variant B
 #ifdef HAVE_WOK_CONFIG_H 
 
-
-
-
 /*---------------------------------------------------------*/
 /* This part is extracted from config.h generated on Linux */
 /*---------------------------------------------------------*/
@@ -17,7 +10,6 @@
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.ac by autoheader.  */
-======= end of combination
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.