conflict

[pettanr/pettanr.git] / db / migrate / 20140612222717_fix_extend_system_data.rb

diff --git a/db/migrate/20140329222717_fix_extend_system_data.rb b/db/migrate/20140612222717_fix_extend_system_data.rb
similarity index 98%
rename from db/migrate/20140329222717_fix_extend_system_data.rb
rename to db/migrate/20140612222717_fix_extend_system_data.rb
index 8582368..ee4e5cc 100644 (file)
--- a/db/migrate/20140329222717_fix_extend_system_data.rb
+++ b/db/migrate/20140612222717_fix_extend_system_data.rb
@@ -5,7 +5,6 @@ class FixExtendSystemData < ActiveRecord::Migration
       if balloon.speech_balloon_template_module_name == 'noname'
         balloon.speech_balloon_template_id = sbt.id
         balloon.speech_balloon_template_module_name = sbt.module_name
-        p balloon
         balloon.boosts 'post'
       end
       balloon.save!