Unnamed

<snip/>        pos = qMax(d->block().position(), pos); // keep it in this block        Q_ASSERT(pos >= 0 && pos < d->priv->length());<<<<<<< .mine        QTextDocumentPrivate::FragmentIterator it = d->priv->find(pos);        Q_ASSERT(!it.atEnd());        idx = it.value()->format;=======            QTextDocumentPrivate::FragmentIterator it = d->priv->find(pos);            Q_ASSERT(!it.atEnd());            idx = it.value()->format;        }>>>>>>> .r652457    }    QTextCharFormat cfmt = d->priv->formatCollection()->charFormat(idx);    cfmt.clearProperty(QTextFormat::ObjectIndex);<snip/>