Merge "docs: fix typo" into qt-dev

     * attempted to update or delete a version of a resource on the server. This is expected

     * to clear itself automatically once the new state is retrieved from the server,

     * though it may remain until the user intervenes manually, perhaps by clearing the

     * local storage and starting over frmo scratch. This is considered a hard error.

     * local storage and starting over from scratch. This is considered a hard error.

     */

    public long numConflictDetectedExceptions;