aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-05-28 09:11:21 +0100
committerGareth Rees <gareth@mysociety.org>2014-05-28 09:11:21 +0100
commite7e777aa044ed210578863fb7329644750820c37 (patch)
tree54a38b7544c41d9f1e64129f6d22894e4c978ef8 /Gemfile.lock
parenta57b32aaac6cc36f0fc54eb517b90e2b694f1f40 (diff)
Update Gemfile.lock
Had issues similar to: - https://github.com/bundler/bundler/issues/1375 - https://github.com/bundler/bundler/issues/1081 Was a problem with the Ubuntu packaged version of bundler. Seems to be resolved in later versions of bundler.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 32a1e77f5..fd02983c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -243,7 +243,7 @@ GEM
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
statistics2 (0.54)
syslog_protocol (0.9.2)