[gimp/gimp-2-8] plug-ins: clean up cherry-pick gone wrong

[Kristian Rietveld <kristian src gnome org>]

commit d7582537164fd87bfdc7ad96eaa3e5397a671c3e
Author: Kristian Rietveld <kris loopnest org>
Date:   Wed Sep 7 10:38:48 2016 +0200

    plug-ins: clean up cherry-pick gone wrong
    
    Commit 03d99ae2e3cbc9d0c7fd805f469b73fba89c5465 left some conflict
    markers in the patch.

 plug-ins/common/Makefile.am |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 15512df..1ce0fc7 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -2604,7 +2604,6 @@ warp_LDADD = \
        $(INTLLIBS)             \
        $(warp_RC)
 
-<<<<<<< HEAD
 waves_SOURCES = \
        waves.c
 
@@ -2621,11 +2620,10 @@ waves_LDADD = \
        $(RT_LIBS)              \
        $(INTLLIBS)             \
        $(waves_RC)
-=======
+
 web_browser_LDFLAGS = $(framework_cocoa)
 
 web_browser_CFLAGS = $(xobjective_c)
->>>>>>> 308efbb... Bug 767830 - Help browser does not launch on OS X
 
 web_browser_SOURCES = \
        web-browser.c