marge

diff --git a/src/plugins/xdxf/xdxfplugin.h b/src/plugins/xdxf/xdxfplugin.h
index 804d187..6c1cbfd 100644 (file)
--- 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