fix small error

diff --git a/src/plugins/xdxf/xdxfplugin.h b/src/plugins/xdxf/xdxfplugin.h
index a95d542..287426d 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.h
+++ b/src/plugins/xdxf/xdxfplugin.h
@@ -146,14 +146,9 @@ private:
     QString searchFile(QString key);
 
     QString searchCache(QString key);
-<<<<<<< HEAD:trunk/src/plugins/xdxf/src/xdxfplugin.h
 
-    //! scan dictionary file to get information about it
-    bool getDictionaryInfo();
-=======
     //! scans dictionary file to get information about it
-    void getDictionaryInfo();
->>>>>>> d87efdac5743196dbae222515ab86c6e321c3d98:src/plugins/xdxf/xdxfplugin.h
+    bool getDictionaryInfo();
 
     int countWords();