fixed merge conflicts in Gemfile and Schema.rb

Fork: 0

opidor / dmpopidor

Browse code fixed merge conflicts in Gemfile and Schema.rb dev
commit 91b840f1e41180f36e7157b11404226c0855744c 2 parents 83fb27e + 611f9cb briley authored on 16 Aug 2016

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/views/shared/_register_form.html.erb

Ignore Space Show notes View config/locales/de.yml

Ignore Space Show notes View config/locales/en-UK.yml

Ignore Space Show notes View config/locales/en-US.yml

Ignore Space Show notes View config/locales/fr.yml

Ignore Space Show notes View db/schema.rb

Show line notes below