summaryrefslogtreecommitdiff
path: root/linguistic/prj
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-29 15:36:30 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-29 15:36:30 +0200
commit4f40fd2727a826d5d0b06617e5179829d66df5d2 (patch)
treebb3fbdb8fd94c48653a3b642b7d59dd10972b439 /linguistic/prj
parent83d7b776fba6a9b6be8e52f221b237b49ff7612d (diff)
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'linguistic/prj')
-rw-r--r--linguistic/prj/d.lst6
1 files changed, 2 insertions, 4 deletions
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index 4b2e240ef2ef..03237f925764 100644
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -7,9 +7,7 @@
..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
mkdir: %_DEST%\inc%_EXT%\linguistic
-<<<<<<< local
..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
-=======
-..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+
..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
->>>>>>> other
+