From 49aa384ee7dcffd19d1a04e90136f58b78ce4f38 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Mon, 2 Jun 2003 03:14:50 +0000
Subject: Resolve conflicts from last commit.

---
 emulators/suse64_glx/Makefile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'emulators')

diff --git a/emulators/suse64_glx/Makefile b/emulators/suse64_glx/Makefile
index 65de769f8af..80ae2855960 100644
--- a/emulators/suse64_glx/Makefile
+++ b/emulators/suse64_glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:19:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/02 03:14:50 jschauma Exp $
 
 DISTNAME=		suse_glx-${SUSE_VERSION}
 PKGREVISION=		2
@@ -21,12 +21,4 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 RPMFILES=		glx-000229-53.i386.rpm
 
 .include "../suse64_linux/Makefile.common"
-<<<<<<< Makefile
-<<<<<<< Makefile
 .include "../../mk/bsd.pkg.mk"
-=======
-.include "../../mk.bsd.pkg.mk"
->>>>>>> 1.4
-=======
-.include "../../mk/bsd.pkg.mk"
->>>>>>> 1.5
-- 
cgit v1.2.3