resolve merge conflict

1 files changed, 2 insertions, 2 deletions

diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index de74efb..23aa82a 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -41,8 +41,8 @@ protected:
         QRegExp _lastSearch;
         QString _name;
-        bool loaded : 1;
-        int _resultCount;
 private:
         int realSearch();
+        bool loaded :1;
+        int _resultCount;
 };