From 8a616c5e6d2a56b2aee5a10d68c27b99458a2c77 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 29 Mar 2011 11:21:38 +0200 Subject: merges --- .../modules/user/controllers/IndexController.php | 3 +- application/modules/user/layouts/user.phtml | 32 +--------------------- 2 files changed, 3 insertions(+), 32 deletions(-) (limited to 'application') diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php index f786eb7..1e15768 100644 --- a/application/modules/user/controllers/IndexController.php +++ b/application/modules/user/controllers/IndexController.php @@ -21,8 +21,9 @@ class User_IndexController extends Zend_Controller_Action '/user/config' => 'Create your own Configuration', '/user/bootmenu' => 'Create your Bootmenu', ); + $this->view->links = $links; } - $this->view->links = $links; + } diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 35f0b22..e09df87 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -19,36 +19,6 @@ echo $this->headScript()."\n";

-<<<<<<< HEAD -

<<
user
-
- Person
- Group
- Role
- BootIso
- PreBoot
- BootMenu
- Config
- BootOs
- Client
- Filter
- Pool
- Auth
- Login
- Register
- Account Löschen
- Logout

@@ -62,6 +32,7 @@ echo $this->headScript()."\n";

Group

@@ -75,7 +46,6 @@ echo $this->headScript()."\n"; Membership >>>>>> d7af4710c133f5cfaf830c9ef617bac9730a77d3 ?>

Select Membership

-- cgit v1.2.3-55-g7522