diff options
| author | Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp> | 2010-07-25 01:30:19 +0900 |
|---|---|---|
| committer | Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp> | 2010-07-25 01:30:19 +0900 |
| commit | fffcf1e80f7ea9ccae627a5a81376ba2c3c06ca0 (patch) | |
| tree | 6df3ef2ec0300636875cef62e5b88651f03af0ec /help/Makefile.am | |
| parent | c2a78ed8fc0ae618b08b16be12cb42822ae13d49 (diff) | |
| download | glade-fffcf1e80f7ea9ccae627a5a81376ba2c3c06ca0.tar.gz | |
Fix conflict.
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 6085e063..738a9237 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -6,8 +6,4 @@ DOC_MODULE = glade DOC_INCLUDES = legal.xml DOC_FIGURES = figures/main-window.png -<<<<<<< HEAD DOC_LINGUAS = bg cs de el en_GB es eu fr hi it oc pt_BR ru sl sv uk zh_CN -======= -DOC_LINGUAS = bg cs de el en_GB es eu fr hi it ja oc pt_BR ru sv zh_CN ->>>>>>> d153e72... Added Japanese translation of help document |