Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bad merge

This commit is contained in:
drigato 2015-03-31 18:21:25 -04:00
parent 220f21ab22
commit 57cd2eda13
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/configs/ACL.php
View File

@ -71,11 +71,8 @@ $ccAcl->allow('G', 'index')
->allow('A', 'user') ->allow('A', 'user')
->allow('A', 'systemstatus') ->allow('A', 'systemstatus')
->allow('A', 'preference') ->allow('A', 'preference')
<<<<<<< HEAD
->allow('A', 'embeddableplayer') ->allow('A', 'embeddableplayer')
=======
->allow('S', 'thank-you') ->allow('S', 'thank-you')
>>>>>>> saas
->allow('S', 'billing'); ->allow('S', 'billing');