fix conflict

2013-05-24 12:59:50 -07:00
parent 4dff618863 e9593dd975
commit 6df8f5b7fd
1 changed files with 1 additions and 0 deletions
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -177,6 +177,7 @@ class Note < ActiveRecord::Base
  def copy_to(new_post)
    new_note = dup
    new_note.post_id = new_post.id
+    new_note.version = 0

    width_ratio = new_post.image_width.to_f / post.image_width
    height_ratio = new_post.image_height.to_f / post.image_height