From 6eb067f6bea470b24457cec5a0819bcfb25a870a Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Tue, 3 Jan 2012 13:01:27 +0900
Subject: [PATCH] merge miss branch

---
 app/views/speach_balloons/show.html.erb | 2 +-
 config/environments/development.rb      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/speach_balloons/show.html.erb b/app/views/speach_balloons/show.html.erb
index 122485bb..89a2d46d 100644
--- a/app/views/speach_balloons/show.html.erb
+++ b/app/views/speach_balloons/show.html.erb
@@ -20,7 +20,7 @@
       Tail:<%= balloon_template.tail -%>
       Border:<%= balloon_template.border -%>
     </p>
-    <img src="<%= balloon_template.resource_picture.url -%>" />
+    <img src="<%= balloon_template.system_picture.url -%>" />
   </div>
 <% end -%>
 <%= link_to 'Back', speach_balloons_path %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd57e43a..1f7eb0e5 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -30,7 +30,6 @@ Pettanr::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 end
-y = YAML.load(open(Rails.root + 'config/aws.yaml').read)
 
 require 'local_picture'
 PictureIO.setup do |config|
-- 
2.11.0