From a4492e92c42222392a96b6fb542572cf49f8cbb1 Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Tue, 24 May 2011 10:50:21 +0200
Subject: Removed lines from merge conflicts

---
 svtools/source/svhtml/htmlkywd.cxx | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'svtools/source/svhtml')

diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index b88466c803ec..0565b52f9f4c 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -549,15 +549,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = {
 extern "C"
 {
 
-<<<<<<< HEAD
-static int
-#if defined( WNT )
- __cdecl
-#endif
-    HTMLCharNameCompare( const void *pFirst, const void *pSecond)
-=======
 static int SAL_CALL HTMLCharNameCompare( const void *pFirst, const void *pSecond)
->>>>>>> Use SAL_CALL / refurbish #include's (IWYU) / sal_Bool->bool
 {
     int nRet = 0;
     if( USHRT_MAX == ((HTML_CharEntry*)pFirst)->cChar )
@@ -1006,15 +998,7 @@ static HTML_ColorEntry aHTMLColorNameTab[] = {
 extern "C"
 {
 
-<<<<<<< HEAD
-static int
-#if defined( WNT )
- __cdecl
-#endif
-    HTMLColorNameCompare( const void *pFirst, const void *pSecond)
-=======
 static int SAL_CALL HTMLColorNameCompare( const void *pFirst, const void *pSecond)
->>>>>>> Use SAL_CALL / refurbish #include's (IWYU) / sal_Bool->bool
 {
     int nRet = 0;
     if( HTML_NO_COLOR == ((HTML_ColorEntry*)pFirst)->nColor )
-- 
cgit