diff options
| author | Gabriel Burt <gabriel.burt@gmail.com> | 2011-05-02 14:33:53 -0500 |
|---|---|---|
| committer | Gabriel Burt <gabriel.burt@gmail.com> | 2011-05-02 14:33:53 -0500 |
| commit | 0c6a208687f58705bae519989d76ba934063274b (patch) | |
| tree | fb0315f64c31bdc759a0fa45c58f4a96aaebef01 | |
| parent | 1491373a63b8ba930e5b6711dfce2a887937c052 (diff) | |
help: Fix Makefile.am conflict
| -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 |