1 files changed, 0 insertions, 34 deletions
diff --git a/wiki/inc/Action/Conflict.php b/wiki/inc/Action/Conflict.php
deleted file mode 100644
index d880b5b..0000000
--- a/wiki/inc/Action/Conflict.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace dokuwiki\Action;
-
-/**
- * Class Conflict
- *
- * Show the conflict resolution screen
- *
- * @package dokuwiki\Action
- */
-class Conflict extends AbstractAction {
-
-    /** @inheritdoc */
-    public function minimumPermission() {
-        global $INFO;
-        if($INFO['exists']) {
-            return AUTH_EDIT;
-        } else {
-            return AUTH_CREATE;
-        }
-    }
-
-    public function tplContent() {
-        global $PRE;
-        global $TEXT;
-        global $SUF;
-        global $SUM;
-
-        html_conflict(con($PRE, $TEXT, $SUF), $SUM);
-        html_diff(con($PRE, $TEXT, $SUF), false);
-    }
-
-}