Yikes.. looking into this now, then I'll deploy to my loomio.dinote.ch site
for testing


On Sun, Jul 28, 2013 at 11:01 PM, jonlemmon <notifications@github.com>wrote:

> In db/schema.rb:
>
> > @@ -11,7 +11,15 @@
> >  #
> >  # It's strongly recommended to check this file into your version control system.
> >
> > -ActiveRecord::Schema.define(:version => 20130629092802) do
> > +<<<<<<< HEAD
>
> mergey bits!
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/loomio/loomio/pull/918/files#r5439811>
> .
>