mergeconflict Gemfilelock

2014-06-12 11:18:22 +02:00
parent 1a48dddb62
commit d24e127b90
1 changed files with 1 additions and 1 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -247,11 +247,11 @@ GEM
    warden (1.2.3)
      rack (>= 1.0)
    webrick (1.3.1)
+<<<<<<< Updated upstream
    wikicloth (0.8.1)
      builder
      expression_parser
      rinku
-
 PLATFORMS
  ruby