[Git][noosfero/noosfero][master] responsive: remove empty conflicting file

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
9e3e94b3 by Braulio Bhavamitra at 2015-12-16T19:58:27Z
responsive: remove empty conflicting file

- - - - -


1 changed file:

- − plugins/responsive/views/layouts/_content.html.erb


Changes:

=====================================
plugins/responsive/views/layouts/_content.html.erb deleted
=====================================
--- a/plugins/responsive/views/layouts/_content.html.erb
+++ /dev/null



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/9e3e94b3e6565e0df9e713d065db27d6b1fec38b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151216/8d7c600e/attachment.html>