summaryrefslogtreecommitdiff
path: root/lib/oxidized/model/model.rb
diff options
context:
space:
mode:
authorElvin Efendi <elvin.efendiev@shopify.com>2015-12-08 18:34:16 -0500
committerElvin Efendi <elvin.efendiev@shopify.com>2015-12-08 18:34:16 -0500
commit2eef353c6ef98662c3092a5a28ee6f167b1d1774 (patch)
treef5a74fd27daeceeafc6141d524fc35ac09846614 /lib/oxidized/model/model.rb
parent1df0f01c6166e1ef1653c90818aaa47118af4700 (diff)
warn when there is a conflict
Diffstat (limited to 'lib/oxidized/model/model.rb')
0 files changed, 0 insertions, 0 deletions