Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| config.yml | ||
| database.yml.example | ||
| environment.rb | ||
| list.yml | ||
| mongoid.yml | ||
| routes.rb | ||
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| config.yml | ||
| database.yml.example | ||
| environment.rb | ||
| list.yml | ||
| mongoid.yml | ||
| routes.rb | ||