Home
last modified time | relevance | path

Searched refs:action_plugin_conflictmerger (Results 1 – 2 of 2) sorted by relevance

/plugin/conflictmerger/tests/
H A Dmerge.test.php24 $this->action = new action_plugin_conflictmerger();
/plugin/conflictmerger/
H A Daction.php44 class action_plugin_conflictmerger extends DokuWiki_Action_Plugin { class