antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Thibault UBUNTU 2016-02-24 16:03:29 +01:00
parent d39e27d271
commit 4d81184816
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
override/classes/FrontController.php
View File

@ -373,13 +373,11 @@ class FrontController extends FrontControllerCore {
'module-referralprogram-referral-program', 'module-cheque-payment',
'module-bankwire-payment', 'module-invite-invite-rules',
'module-advsendtoafriend-sendtoafriend-form', 'featured',
<<<<<<< HEAD
'list-tag-sales',
'module-contactform-provider',
'module-contactform-press'
=======
'list-tag-sales','module-ant_support-help','module-ant_support_form-support',
>>>>>>> 09ee75be23460bb154bf60137e4372074f6fc1de
'module-ant_support-help',
'module-ant_support_form-support',
);
$displayRight = array(