From f068d5bd9a7e4c3f99a9c1e02f30be4dfbbf5340 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Wed, 2 Jul 2014 12:36:03 -0400
Subject: [PATCH] Fixed cache merge

---
 airtime_mvc/application/models/Cache.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/airtime_mvc/application/models/Cache.php b/airtime_mvc/application/models/Cache.php
index 0f06b786e..302c3c1cc 100644
--- a/airtime_mvc/application/models/Cache.php
+++ b/airtime_mvc/application/models/Cache.php
@@ -15,7 +15,6 @@ class Cache
                 $cacheKey = "{$key}{$a}";
         }
 
-<<<<<<< HEAD
         return $cacheKey;
     }
     
@@ -36,27 +35,10 @@ class Cache
         //return apc_fetch($cacheKey);
         return false;
     }
-}
-=======
-		return $cacheKey;
-	}
-	
-	public function store($key, $value, $isUserValue, $userId = null) {
-		
-		$cacheKey = self::createCacheKey($key, $userId);
-		return apc_store($cacheKey, $value);
-	}
-	
-	public function fetch($key, $isUserValue, $userId = null) {
-		
-		$cacheKey = self::createCacheKey($key, $isUserValue, $userId);
-		return apc_fetch($cacheKey);
-	}
-	
+
 	public static function clear()
 	{
 	    apc_clear_cache('user');
 	    apc_clear_cache();
 	}
 }
->>>>>>> cc-5709-airtime-analyzer-buy-now