diff options
Diffstat (limited to 'help/Makefile.am')
| -rw-r--r-- | help/Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/help/Makefile.am b/help/Makefile.am index d53fe77ba..2dc5998b5 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 |