Conflicts: app/controllers/application_controller.rb app/controllers/confirmations_controller.rb |
||
|---|---|---|
| .. | ||
| _form_page.html.erb | ||
| confirmation.html.erb | ||
| form_page.html.erb | ||
| index.html.erb | ||
| role_page.html.erb | ||
Conflicts: app/controllers/application_controller.rb app/controllers/confirmations_controller.rb |
||
|---|---|---|
| .. | ||
| _form_page.html.erb | ||
| confirmation.html.erb | ||
| form_page.html.erb | ||
| index.html.erb | ||
| role_page.html.erb | ||