fixed merge conflicts in app/admin/user.rb

Fork: 0

opidor / dmpopidor

Browse code fixed merge conflicts in app/admin/user.rb dev
1 parent 7e471f6 commit 5e0277ab8ef68fdde38a4b1f0e251588e155dc5c Brian Riley authored on 22 Jul 2016

Patch

Unified Split

Showing 1 changed file

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

Show line notes below