Fix automatically merged settings

joegattnet · Oct 17, 2013 · 058019f · 058019f
1 parent 17e4ac4
commit 058019f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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