diff options
| author | bad <bad@pkgsrc.org> | 2009-12-06 10:11:14 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2009-12-06 10:11:14 +0000 |
| commit | 70ab6bdae2842232290a006a2a5a171d9be2b763 (patch) | |
| tree | 21a2752b8cd63da770f683e8f83ab4de5739ece3 /misc | |
| parent | 586a89f1076a5a4c05c603b492b97a39968c8647 (diff) | |
| download | pkgsrc-70ab6bdae2842232290a006a2a5a171d9be2b763.tar.gz | |
Remove conflict marker in previous.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 2cd91ff20e8..d7597497e18 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2009/12/05 15:00:16 bad Exp $ +# $NetBSD: Makefile,v 1.42 2009/12/06 10:11:14 bad Exp $ DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} @@ -46,11 +46,7 @@ RUN_LDCONFIG= no .if ${EMUL_PLATFORM} == "linux-i386" DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US -<<<<<<< Makefile WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-2_en-US.9421 -======= -WRKSRC= ${WRKDIR}/OOH680_m18_native_packed-1_en-US.9364 ->>>>>>> 1.40 .elif ${EMUL_PLATFORM} == "solaris-i386" DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages |