Removed one of the variables (#146)

aismail · May 17, 2013 · cd1b8fe · cd1b8fe
1 parent 168575b
commit cd1b8fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/conf/general.js b/app/conf/general.js
@@ -15,8 +15,7 @@ App.general = {
     SVG_PATH: '/public/svg',
     ENVIRONMENT: 'testing',
 
-    USE_BRANDING = false;
-    EXTRA_BRANDING =["/assets/custom.css"];
+    EXTRA_BRANDING: [],
 
     // Throw exceptions and don't catch them with our wrapper
     // so that we can debug them easier.

diff --git a/app/includes.js b/app/includes.js
@@ -37,8 +37,8 @@ function getStaticUrl() {
 
 function includeCssAndJs() {
     includeStaticFilesInBundles();
-    if (USE_BRANDING){
-        includeBranding(EXTRA_BRANDING);
+    if (App.general.EXTRA_BRANDING.length){
+        includeBranding(App.general.EXTRA_BRANDING);
     }
     includeMainEntryPoint();
     includeTemplates();