[banshee] help: Fix Makefile.am conflict

[Gabriel Burt <gburt src gnome org>]

commit 0c6a208687f58705bae519989d76ba934063274b
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Mon May 2 14:33:53 2011 -0500

    help: Fix Makefile.am conflict

 help/Makefile.am |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/help/Makefile.am b/help/Makefile.am
index d53fe77..2dc5998 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -29,11 +29,7 @@ DOC_PAGES = \
 	sync.page \
 	ui.page
 
-<<<<<<< HEAD
 DOC_LINGUAS = ca da de el es fr gl hu ja sl uk
-=======
-DOC_LINGUAS = ca da de el es fr gl sl uk
->>>>>>> Added uk translation
 dist-hook: doc-dist-hook
 
 endif