From e31d5077ac17858115ad8562c45c76cc746e2e66 Mon Sep 17 00:00:00 2001
From: Lucas Bickel <hairmare@rabe.ch>
Date: Fri, 21 Jul 2017 13:28:08 +0200
Subject: [PATCH] Fix rebasing typo

---
 airtime_mvc/application/configs/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 54d89b0ba..a41f67f5f 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -58,7 +58,7 @@ class Config {
 
         // Tells us where file uploads will be uploaded to.
         // It will either be set to a cloud storage backend or local file storage.
-        $CC_CONFIG["current_backend"] = $cloudStorageValues["current_backend"]["storage_backend"];
+        $CC_CONFIG["current_backend"] = $values["current_backend"]["storage_backend"];
 
         $CC_CONFIG['cache_ahead_hours'] = $values['general']['cache_ahead_hours'];