Keep the version that has the length option, that is more compatible with
newer mysql versions.


On Wed, Jul 31, 2013 at 4:58 PM, Jonne Haß <notifications@github.com> wrote:

> In db/schema.rb:
>
> >    add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=>767}
> > +=======
> > +  add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url"
> > +>>>>>>> ef51c84... Refactor scss, move user_signed_in, restore schema.rb and rel=backbone
>
> You committed a merge conflict here.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/diaspora/diaspora/pull/4316/files#r5515650>
> .
>