[glade3] Fix conflict.

[Takayuki Kusano <kusano src gnome org>]

commit fffcf1e80f7ea9ccae627a5a81376ba2c3c06ca0
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Sun Jul 25 01:30:19 2010 +0900

    Fix conflict.

 help/Makefile.am |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/help/Makefile.am b/help/Makefile.am
index 6085e06..738a923 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