noosfero | fix schema and migrations after merge (c155400b)

[Leandro Nunes]

New comment for Commit c155400b

https://gitlab.com/noosfero/noosfero/commit/c155400b7a863994b43a55b31c98fc87fac2ed1e#note_3886413


Author: Leandro Nunes

@diguliu look at the commit you posted here. There is a merge problem in the file app/models/article.rb 
Looks for 6fa2f904983046ed816efe293ba9dcad19a67a4b

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160223/9e1ac7a9/attachment.html>