| Chunk |
|---|
| Conflicting content |
|---|
"with this query");
}
<<<<<<< HEAD
// This code queries the sms and mms tables and returns a unified result set
// of text matches. We query the sms table which is pretty simple. We also
// query the pdu, part and addr table to get the mms result. Notet we're
// using a UNION so we have to have the same number of result columns from
// both queries.
=======
>>>>>>> fc85d2bcf07cd0ce885f220e17215736a5031946
String searchString = uri.getQueryParameter("pattern") + "*";
try { |
| Solution content |
|---|
"with this query");
}
String searchString = uri.getQueryParameter("pattern") + "*";
try { |
| File |
|---|
| MmsSmsProvider.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |