[banshee] Added uk translation

[Daniel Korostil <dankor src gnome org>]

commit 8e4f11c25d5bff64514739b0622ece95f0882464
Author: Daniel Korostil <ted korostiled gmail com>
Date:   Sun May 1 21:06:51 2011 +0300

    Added uk translation

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