remove git merge conflicts artifacts

Fork: 0

opidor / dmpopidor

Browse code remove git merge conflicts artifacts dev
1 parent d329b96 commit d01906f126552e8ecbcdb77744c7bf737623d51c DamodarSojka authored on 10 Aug 2016

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View app/assets/stylesheets/bootstrap_and_overrides.css.less

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

Show line notes below