Commit e4715463ebe6d1b01382d8e8232f0b2a1af71541
1 parent
457d4ed1
fixed merge error (#2506)
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2090 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
0 additions
and
3 deletions
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php
| @@ -9,11 +9,8 @@ | @@ -9,11 +9,8 @@ | ||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | require_once("../../../../../config/dmsDefaults.php"); | 11 | require_once("../../../../../config/dmsDefaults.php"); |
| 12 | -<<<<<<< editGroupSuccess.php | ||
| 13 | require_once("../adminUI.inc"); | 12 | require_once("../adminUI.inc"); |
| 14 | require_once("$default->fileSystemRoot/presentation/Html.inc"); | 13 | require_once("$default->fileSystemRoot/presentation/Html.inc"); |
| 15 | -======= | ||
| 16 | ->>>>>>> 1.7 | ||
| 17 | 14 | ||
| 18 | global $default; | 15 | global $default; |
| 19 | 16 |