From e4715463ebe6d1b01382d8e8232f0b2a1af71541 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 6 Jun 2003 10:31:47 +0000 Subject: [PATCH] fixed merge error (#2506) --- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php | 3 --- 1 file changed, 0 insertions(+), 3 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php index f17268e..8a4e8c2 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php @@ -9,11 +9,8 @@ */ require_once("../../../../../config/dmsDefaults.php"); -<<<<<<< editGroupSuccess.php require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); -======= ->>>>>>> 1.7 global $default; -- libgit2 0.21.4