From 01ede6790d338aa2b10327a0691f2bb168d53312 Mon Sep 17 00:00:00 2001
From: Ruediger Timm <rt@openoffice.org>
Date: Thu, 24 Jun 2010 10:49:45 +0200
Subject: masterfix: #i10000# Merge error corrected.

---
 sw/source/filter/ww8/wrtww8.cxx | 1 -
 1 file changed, 1 deletion(-)
 mode change 100755 => 100644 sw/source/filter/ww8/wrtww8.cxx

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
old mode 100755
new mode 100644
index 1e2f960cc3..f541d57b93
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2491,7 +2491,6 @@ void MSWordExportBase::WriteText()
 // This piece of code always breaks builds...
 #if 0
 #ifdef DEBUG
-#if 0
         if (aNodeSet.find(pNd) == aNodeSet.end())
         {
             aNodeSet.insert(pNd);
-- 
cgit v1.2.3