diff options
| author | zofrex <zofrex@gmail.com> | 2012-06-29 19:17:56 -0400 |
|---|---|---|
| committer | zofrex <zofrex@gmail.com> | 2012-06-29 19:17:56 -0400 |
| commit | 336d89b420dc43f33b380d4532f1c5e11d41860c (patch) | |
| tree | bf3bc1c639fbbc5545397b98132349a51b208daf /lib/bundler.rb | |
| parent | accdd1cb8c4066b18dd9f51fdd294085bb455266 (diff) | |
| download | bundler-336d89b420dc43f33b380d4532f1c5e11d41860c.tar.gz | |
Issue #2000 Add test for conflict markers in Gemfile.lock
Diffstat (limited to 'lib/bundler.rb')
| -rw-r--r-- | lib/bundler.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 4df3ffb9..7497e03d 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -59,6 +59,7 @@ module Bundler class InvalidOption < DslError ; end class HTTPError < BundlerError; status_code(17) ; end class RubyVersionMismatch < BundlerError; status_code(18) ; end + class LockfileError < BundlerError; status_code(19) ; end WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! |