diff options
| author | Andre Arko <andre@arko.net> | 2013-02-17 14:57:23 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2013-02-17 14:57:23 -0800 |
| commit | 15d1207aed22932240e62b4e33f23c161324f31e (patch) | |
| tree | 8ac45d2c1a73479e1b3384084af30fd9a202398a /lib/bundler/fetcher.rb | |
| parent | 8f51a5a266567211e663644aba243791ff2ac3f4 (diff) | |
| parent | 9d5293812e832499dee1b6c2d515028d5aee8e36 (diff) | |
| download | bundler-15d1207aed22932240e62b4e33f23c161324f31e.tar.gz | |
Merge pull request #2007 from zofrex/issue-2000
Abort installation if Gemfile.lock contains merge conflict markers
Conflicts:
lib/bundler.rb
Diffstat (limited to 'lib/bundler/fetcher.rb')
0 files changed, 0 insertions, 0 deletions