From 4b1691361bf2a6b25428392a0ad49ddd2d4debf1 Mon Sep 17 00:00:00 2001 From: Paminger Date: Tue, 10 May 2016 14:37:13 +0200 Subject: [PATCH] Merge --- application/config/fhcomplete.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/application/config/fhcomplete.php b/application/config/fhcomplete.php index 54bb146d4..2a3b16462 100644 --- a/application/config/fhcomplete.php +++ b/application/config/fhcomplete.php @@ -22,12 +22,7 @@ $config['fhc_acl'] = array 'public.tbl_prestudent' => 'basis/person', 'public.tbl_prestudentstatus' => 'basis/person', 'public.tbl_organisationseinheit' => 'basis/organisationseinheit', -<<<<<<< HEAD 'public.tbl_sprache' => 'admin', 'public.tbl_msg_thread' => 'admin', 'public.tbl_msg_message' => 'admin' ); -======= - 'public.tbl_sprache' => 'admin' -); ->>>>>>> 44ebe15c9cab8fbbf8396d255648b8afda0f5d14