Searched refs:_conflictingBlocks (Results 1 – 2 of 2) sorted by path
18 private $_conflictingBlocks; variable in dokuwiki\\plugin\\farmsync\\meta\\PageConflict24 return $this->_conflictingBlocks;31 $this->_conflictingBlocks = $conflictingBlocks;
49 if (!$diff3->_conflictingBlocks) {58 $result->setConflictingBlocks($diff3->_conflictingBlocks);