summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-03 18:37:25 (UTC)
committer waspe <waspe>2003-11-03 18:37:25 (UTC)
commitfd87de118d519108b99125f190f3aa6bd2a0b4cb (patch) (unidiff)
treef71229f0ba9cba7ece5c9c2b306fb8c39e75df67
parentc0fe2d62abe68de74de6b8bf91635c1cdaf5d239 (diff)
downloadopie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.zip
opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.tar.gz
opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.tar.bz2
resolve merge conflict
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/searchgroup.h4
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
@@ -40,10 +40,10 @@ protected:
40 QRegExp _search; 40 QRegExp _search;
41 QRegExp _lastSearch; 41 QRegExp _lastSearch;
42 QString _name; 42 QString _name;
43 bool loaded : 1;
44 int _resultCount;
45private: 43private:
46 int realSearch(); 44 int realSearch();
45 bool loaded :1;
46 int _resultCount;
47}; 47};
48 48
49#endif 49#endif