diff options
| author | davegandy <dave@davegandy.com> | 2013-10-01 02:22:41 +0400 |
|---|---|---|
| committer | davegandy <dave@davegandy.com> | 2013-10-01 02:22:41 +0400 |
| commit | 495649eaea4b058ce4ffe5253ca76cb329e291ab (patch) | |
| tree | 595d2abba1c3d414d305b3ba80def909a38b25bb /Gemfile.lock | |
| parent | 362c4a9441f614a0653d71e7e75692d1ed7603c8 (diff) | |
| parent | b2a30e70e16a078055a1906e10f06d17dde5474b (diff) | |
merge conficts
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a00e13f1e..b677d9c0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,4 +43,4 @@ PLATFORMS DEPENDENCIES debugger - jekyll (= 1.0) + jekyll (~> 1.0) |