summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Korostil <ted.korostiled@gmail.com>2011-05-01 21:06:51 +0300
committerDaniel Korostil <ted.korostiled@gmail.com>2011-05-01 21:06:51 +0300
commit8e4f11c25d5bff64514739b0622ece95f0882464 (patch)
treec572f69901a320f83534e060ea6c5bb7e91c71a0
parent02f62b467a915fa6db3bb352f633a5e7f4261fc9 (diff)
Added uk translation
-rw-r--r--help/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/help/Makefile.am b/help/Makefile.am
index 2aeffdf6a..c5b47e295 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