[pkgsrc/trunk]: pkgsrc/misc/openoffice2-bin Remove conflict marker in previous.

[bad <bad%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fc878426cb0
branches:  trunk
changeset: 568153:7fc878426cb0
user:      bad <bad%pkgsrc.org@localhost>
date:      Sun Dec 06 10:11:14 2009 +0000

description:
Remove conflict marker in previous.

diffstat:

 misc/openoffice2-bin/Makefile |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (21 lines):

diff -r 9d0b5d864ab2 -r 7fc878426cb0 misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile     Sun Dec 06 07:55:23 2009 +0000
+++ b/misc/openoffice2-bin/Makefile     Sun Dec 06 10:11:14 2009 +0000
@@ -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 @@
 
 .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