From 058019fcdebd1ff83a781e3997e314fc21b8b0b9 Mon Sep 17 00:00:00 2001 From: joegatt Date: Thu, 17 Oct 2013 18:21:58 +0200 Subject: [PATCH] Fix automatically merged settings --- config/services.settings.yml | 2 +- config/settings.yml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/services.settings.yml b/config/services.settings.yml index c3f64568..8c6b5714 100644 --- a/config/services.settings.yml +++ b/config/services.settings.yml @@ -3,7 +3,7 @@ defaults: &defaults facebook_app_id: 142214389156795 google_analytics_key: 'UA-1346274-1' - twitter_user_name: nembrot + twitter_user_name: joegattnet development: <<: *defaults diff --git a/config/settings.yml b/config/settings.yml index 35fa0577..4e5033f2 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -142,7 +142,7 @@ staging: asset_host: http://a4.joegatt.org evernote: server: https://www.evernote.com - notebooks: 2be62491-08b9-436a-b029-fb68a4b882bd + notebooks: 85d8c66d-f0ee-4c56-acac-e30ab88ce0ce stream_binaries: false synchronous: true always_reset_on_create: true @@ -153,10 +153,9 @@ production: <<: *defaults host: joegatt.net asset_host: http://a3.joegatt.org - google_analytics_key: 'UA-16898823-1' evernote: server: https://www.evernote.com - notebooks: 2be62491-08b9-436a-b029-fb68a4b882bd + notebooks: 85d8c66d-f0ee-4c56-acac-e30ab88ce0ce stream_binaries: false synchronous: false always_reset_on_create: true