summaryrefslogtreecommitdiff
path: root/ucb/prj/d.lst
diff options
context:
space:
mode:
authorKai Sommerfeld <kso@openoffice.org>2001-04-04 13:55:35 +0000
committerKai Sommerfeld <kso@openoffice.org>2001-04-04 13:55:35 +0000
commit93d64e019842f2d90c060774f72cb5ba924ee7fa (patch)
tree53f4527203f9ce2f63df12ac2e2bf0df4b3e2993 /ucb/prj/d.lst
parentcc7b9393fe750b6c1ce255c88ef3a7e0c30398e8 (diff)
Fixed: Syntax error due to leftover from merge conflict :(
Diffstat (limited to 'ucb/prj/d.lst')
-rw-r--r--ucb/prj/d.lst1
1 files changed, 0 insertions, 1 deletions
diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 5694204316bd..ee7028f85ce3 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -37,4 +37,3 @@
dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
dos: sh -c "if test %OS% = MACOSX; then create-libstatic-link %_DEST%\lib%_EXT%; fi"
->>>>>>> 1.6