From d24e127b902ae3a1d83e004ded521feeb362e8b5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Thu, 12 Jun 2014 11:18:22 +0200
Subject: [PATCH] mergeconflict Gemfilelock

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 47b8928..bfd0ce0 100644
--- 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