merge miss branch

diff --git a/app/views/speach_balloons/show.html.erb b/app/views/speach_balloons/show.html.erb
index 122485b..89a2d46 100644 (file)
--- a/app/views/speach_balloons/show.html.erb
+++ b/app/views/speach_balloons/show.html.erb
@@ -20,7 +20,7 @@
       Tail:<%= balloon_template.tail -%>\r
       Border:<%= balloon_template.border -%>\r
     </p>\r
-    <img src="<%= balloon_template.resource_picture.url -%>" />\r
+    <img src="<%= balloon_template.system_picture.url -%>" />\r
   </div>\r
 <% end -%>\r
 <%= link_to 'Back', speach_balloons_path %>

diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd57e43..1f7eb0e 100644 (file)
--- 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|