From 85bc15015965167b923f82650377f6cc11d233e1 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 20 Apr 2012 14:46:23 -0400
Subject: [PATCH] CC-3694: Upgrade fails with Propel database conversion.

-fixed
---
 airtime_mvc/application/configs/airtime-conf-production.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/airtime_mvc/application/configs/airtime-conf-production.php b/airtime_mvc/application/configs/airtime-conf-production.php
index 78e26d9d3..785b729c9 100644
--- a/airtime_mvc/application/configs/airtime-conf-production.php
+++ b/airtime_mvc/application/configs/airtime-conf-production.php
@@ -8,6 +8,7 @@
  * that the user can customize these.
  */
 
+require_once (__DIR__."/conf.php");
 
 global $CC_CONFIG;