remove obsolete merging tool attempt

vincent-peugnet · Nov 12, 2023 · 86c5960 · 86c5960
1 parent c99e480
commit 86c5960
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/app/class/Controllerpage.php b/app/class/Controllerpage.php
@@ -469,9 +469,6 @@ public function update($page)
 
                     $this->pagemanager->update($this->page);
                 }
-
-
-                //$this->showtemplate('updatemerge', $compare);
             } else {
                 // If the editor session finished during the editing, let's try to reconnect to save the editing
                 $_SESSION['pageupdate'] = $_POST;

diff --git a/app/view/templates/updatemerge.php b/app/view/templates/updatemerge.php