From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/web/designer/lib/module.conf.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/interface/web/designer/lib/module.conf.php b/interface/web/designer/lib/module.conf.php
index 72ffc4a..117f79b 100644
--- a/interface/web/designer/lib/module.conf.php
+++ b/interface/web/designer/lib/module.conf.php
@@ -28,7 +28,8 @@
),
),
),
- 1 =>
+ /*
+ 1 =>
array (
'title' => 'Formulare',
'open' => '1',
@@ -88,6 +89,7 @@
),
),
),
+ */
),
)
?>
\ No newline at end of file
--
Gitblit v1.9.1