Searched +full:conflict -(+path:inc +path:lang) -(+path:lib +path:plugins +path:lang) -(+path:lib +path:tpl +path:dokuwiki +path:lang) (Results 1 – 8 of 8) sorted by relevance
9 * Class Conflict11 * Show the conflict resolution screen15 class Conflict extends AbstractAction14 class Conflict extends AbstractAction global() class
48 //conflict check54 throw new ActionException('conflict');
80 // This is used for conflict detection
8 * DokuWiki Page Conflict Interface30 * Show conflict form to ask whether save anyway or cancel the page edits42 echo p_locale_xhtml('conflict');55 echo $form->toHTML('Conflict');
35 * as, in general, it's ugly and tends to conflict with plain-text. Ensuring all
319 409 => 'Conflict',
616 * show warning on conflict detection
1322 * Conflict counter.