diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-03 06:35:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-03 06:35:51 +0000 |
| commit | f2bedd49e4a9e464b6e6027a4289030b6f755b51 (patch) | |
| tree | b1abf976d344bdcefa0a6d6604f38790a02f9823 /sfx2/source/appl/makefile.mk | |
| parent | 28ad88000f36cd4dc64bbb75ebe73091b5be0f3b (diff) | |
#i10000# Remove conflict markers left over from last resync.
Diffstat (limited to 'sfx2/source/appl/makefile.mk')
| -rw-r--r-- | sfx2/source/appl/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index 5f3a4e1ffa8b..661dae246236 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.42 $ +# $Revision: 1.43 $ # -# last change: $Author: rt $ $Date: 2006-05-02 16:19:50 $ +# last change: $Author: rt $ $Date: 2006-05-03 07:35:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -125,7 +125,6 @@ EXCEPTIONSFILES=\ SLOFILES +=\ $(SLO)$/appmac.obj .ENDIF ->>>>>>> 1.41 # --- Targets ------------------------------------------------------- |