From 57cd2eda13dd00aa98c587859cb1d7ab20218c48 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Tue, 31 Mar 2015 18:21:25 -0400
Subject: [PATCH] bad merge

---
 airtime_mvc/application/configs/ACL.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php
index fe6e4d3d6..1386d1dee 100644
--- a/airtime_mvc/application/configs/ACL.php
+++ b/airtime_mvc/application/configs/ACL.php
@@ -71,11 +71,8 @@ $ccAcl->allow('G', 'index')
       ->allow('A', 'user')
       ->allow('A', 'systemstatus')
       ->allow('A', 'preference')
-<<<<<<< HEAD
       ->allow('A', 'embeddableplayer')
-=======
       ->allow('S', 'thank-you')
->>>>>>> saas
       ->allow('S', 'billing');