Remove CVS conflict markers from Makefile.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Mon Apr 2 16:21:21 2018 +0200
Changeset:	dbbb90fa6df71a97066f04c5b7a9e6f100958364

Modified Files:
	shotwell/Makefile

Log Message:
Remove CVS conflict markers from Makefile.

Noticed by wiz@, thanks!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dbbb90fa6df71a97066f04c5b7a9e6f100958364

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 shotwell/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diffs:
diff --git a/shotwell/Makefile b/shotwell/Makefile
index 1c7e04b959..86a0a4ad15 100644
--- a/shotwell/Makefile
+++ b/shotwell/Makefile
@@ -1,11 +1,6 @@
 # $NetBSD: Makefile,v 1.89 2018/03/12 11:16:50 wiz Exp $
 
-<<<<<<< Makefile
 DISTNAME=		shotwell-0.27.4
-=======
-DISTNAME=		shotwell-0.22.0
-PKGREVISION=		18
->>>>>>> 1.89
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/shotwell/0.27/}
 EXTRACT_SUFX=		.tar.xz