Browse code fixed merge conflicts in schema.rb dev
commit 25894b765d4ab4aabac63e9eb5cc97c18bcd6f1f 2 parents c3ad155 + 639d2b1 Brian Riley authored on 3 Feb 2017

Showing 13 changed files

• app/controllers/templates_controller.rb
• app/models/phase.rb
• app/models/question.rb
• app/models/question_option.rb
• app/models/section.rb
• app/models/suggested_answer.rb
• app/models/template.rb
• app/views/dmptemplates/_add_question.html.erb
• app/views/dmptemplates/_admin_nav_tabs.html.erb
• app/views/templates/_admin_nav_tabs.html.erb
• app/views/templates/_show_phases_sections.html.erb
• app/views/templates/admin_index.html.erb
• db/schema.rb

Ignore Space Show notes View app/controllers/templates_controller.rb

Ignore Space Show notes View app/models/phase.rb

Ignore Space Show notes View app/models/question.rb

Ignore Space Show notes View app/models/question_option.rb

Ignore Space Show notes View app/models/section.rb

Ignore Space Show notes View app/models/suggested_answer.rb

Ignore Space Show notes View app/models/template.rb

Show notes View app/views/dmptemplates/_add_question.html.erb 100644 → 0

Show notes View app/views/dmptemplates/_admin_nav_tabs.html.erb 100644 → 0

Ignore Space Show notes View app/views/templates/_admin_nav_tabs.html.erb

Ignore Space Show notes View app/views/templates/_show_phases_sections.html.erb

Ignore Space Show notes View app/views/templates/admin_index.html.erb

Ignore Space Show notes View db/schema.rb

Show line notes below