From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/tools/lib/menu.d/import.menu.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/web/tools/lib/menu.d/import.menu.php b/interface/web/tools/lib/menu.d/import.menu.php
index bd92d8c..477c075 100644
--- a/interface/web/tools/lib/menu.d/import.menu.php
+++ b/interface/web/tools/lib/menu.d/import.menu.php
@@ -15,10 +15,11 @@
 				  'target' 	=> 'content',
 				  'link'	=> 'tools/dns_import_tupa.php');
 
+/* not yet complete
 $items[] = array( 'title' 	=> 'Plesk',
 				  'target' 	=> 'content',
 				  'link'	=> 'tools/import_plesk.php');
-
+*/
 				  
 $module['nav'][] = array(	'title'	=> 'Import',
 							'open' 	=> 1,

--
Gitblit v1.9.1