From: yasushiito <yas@pen-chan.jp>
Date: Mon, 3 Aug 2015 23:04:31 +0000 (+0900)
Subject: fix: bin tool
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=6d4de2e0ee79c069c9348603900cce91a9743f23

fix: bin tool
---

6d4de2e0ee79c069c9348603900cce91a9743f23
diff --cc app/models/picture.rb
index 913b7f76,3e0cb1d1..3417bd93
--- a/app/models/picture.rb
+++ b/app/models/picture.rb
@@@ -28,12 -28,8 +28,17 @@@ class Picture < Peta::Conten
      find_index.where(artist_id: artist_id)
    end
    
++<<<<<<< HEAD
 +  scope :find_by_md5, -> (md5) do 
 +    find_index.where(md5: md5).order(updated_at: :desc)
 +  end
 +  
 +  scope :find_by_md5_without_original_picture, -> (md5, original_picture_id) do 
 +    self.find_by_md5(md5).where.not(original_picture_id: original_picture_id).order(updated_at: :desc)
++=======
+   scope :find_by_original_picture, -> (original_picture_id) do 
+     find_index.where(original_picture_id: original_picture_id)
++>>>>>>> 87c9866f541c4c7be4c136f2034d2fecbab787a8
    end
    
    def supply_default