Conflicts: app/views/layouts/_base_footer.html.erb app/views/welcome/index.html.erb |
||
---|---|---|
.. | ||
migrate | ||
development.sqlite3 | ||
schema.rb |
Conflicts: app/views/layouts/_base_footer.html.erb app/views/welcome/index.html.erb |
||
---|---|---|
.. | ||
migrate | ||
development.sqlite3 | ||
schema.rb |