Browse code fixed merge conflict in schema.rb dev
commit d1b09d71083671636848d76c2759cc9c068f0471 2 parents 6db1d84 + 9465772 Brian Riley authored on 28 Apr 2017

Showing 11 changed files

• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/models/annotation.rb
• app/models/guidance_group.rb
• app/models/phase.rb
• app/models/plan.rb
• app/views/layouts/_signin_signout.html.erb
• app/views/plans/_plan_details.html.erb
• db/migrate/20170130105546_create_plan_guidance_groups.rb
• db/migrate/20170130111947_add_selected_to_plan_guidance_groups.rb
• db/schema.rb

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

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

Ignore Space Show notes View app/models/annotation.rb 0 → 100644

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

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

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

Ignore Space Show notes View app/views/layouts/_signin_signout.html.erb

Ignore Space Show notes View app/views/plans/_plan_details.html.erb

Show notes View db/migrate/20170130105546_create_plan_guidance_groups.rb 100644 → 0

Show notes View db/migrate/20170130111947_add_selected_to_plan_guidance_groups.rb 100644 → 0

Ignore Space Show notes View db/schema.rb

Show line notes below