fixed merge conflicts

Fork: 0

opidor / dmpopidor

Browse code fixed merge conflicts dev
commit 8d7a210fa3dffd729213c5a26b375bcad6887e31 2 parents a5d7982 + a698c05 Brian Riley authored on 16 Jun 2017

Patch

Unified Split

Showing 7 changed files

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

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

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb

Ignore Space Show notes View lib/assets/stylesheets/roadmap-form.scss

Ignore Space Show notes View lib/assets/stylesheets/roadmap-tabs.scss

Ignore Space Show notes View lib/assets/stylesheets/roadmap.scss

Ignore Space Show notes View test/unit/user_test.rb

Show line notes below