From fd87de118d519108b99125f190f3aa6bd2a0b4cb Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 18:37:25 +0000
Subject: resolve merge conflict

---
(limited to 'core/pim/osearch')

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
@@ -40,10 +40,10 @@ protected:
 	QRegExp _search;
 	QRegExp _lastSearch;
 	QString _name;
-	bool loaded : 1;
-	int _resultCount;
 private:
 	int realSearch();
+	bool loaded :1;
+	int _resultCount;
 };
 
 #endif
--
cgit v0.9.0.2