From aab888a6ce5142097bddde1c9e37b1fef9cbb373 Mon Sep 17 00:00:00 2001 From: Jakub Jaszczynski Date: Mon, 13 Sep 2010 15:20:06 +0200 Subject: [PATCH] marge --- src/plugins/xdxf/xdxfplugin.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/plugins/xdxf/xdxfplugin.h b/src/plugins/xdxf/xdxfplugin.h index 804d187..6c1cbfd 100644 --- a/src/plugins/xdxf/xdxfplugin.h +++ b/src/plugins/xdxf/xdxfplugin.h @@ -66,11 +66,7 @@ public: //! \returns dictionary type (xdxf, google translate, etc) QString type() const; -<<<<<<< HEAD //! returns information about dictionary in xml (name, authors, etc) -======= - //! \returns information about dictionary in html (name, authors, etc) ->>>>>>> master QString infoNote() const; /*! \returns DictDialog object that creates dialogs -- 1.7.9.5