diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 14:04:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 14:04:27 +0000 |
| commit | ba3a9410163a8656354173fc7bf61f816b5bb5f9 (patch) | |
| tree | c05b46c84728488a7c4e8a8d9c86cd8ec887b806 /dbaccess/util | |
| parent | 7a91541432bb9543d953a134063bf728bf337a25 (diff) | |
#i10000# conflicts fixed
Diffstat (limited to 'dbaccess/util')
| -rw-r--r-- | dbaccess/util/makefile.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index d619cc4af..d93902279 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.37 $ # -# last change: $Author: kz $ $Date: 2008-04-04 15:02:58 $ +# last change: $Author: kz $ $Date: 2008-04-04 15:04:27 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -75,11 +75,8 @@ SHL1STDLIBS= \ $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) \ -<<<<<<< makefile.mk $(BASICLIB) \ -======= $(FWELIB) \ ->>>>>>> 1.32.10.2 $(SALHELPERLIB) SHL1LIBS=$(LIB1TARGET) |