| author | waspe <waspe> | 2003-11-03 18:37:25 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 18:37:25 (UTC) |
| commit | fd87de118d519108b99125f190f3aa6bd2a0b4cb (patch) (side-by-side diff) | |
| tree | f71229f0ba9cba7ece5c9c2b306fb8c39e75df67 | |
| parent | c0fe2d62abe68de74de6b8bf91635c1cdaf5d239 (diff) | |
| download | opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.zip opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.tar.gz opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.tar.bz2 | |
resolve merge conflict
| -rw-r--r-- | core/pim/osearch/searchgroup.h | 4 |
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; }; |