From b8013a47fd3f214fdeef9afc90e0b85b891c3659 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Sun, 19 Oct 2014 16:30:04 +0200
Subject: [PATCH] merge gemfile.lock

---
 Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 91116a2..105de97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,9 +266,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-
-=======
-  RedCloth
   acts_as_votable
   annotate (>= 2.5.0)
   awesome_nested_set
@@ -306,6 +303,7 @@ DEPENDENCIES
   rolify
   rspec-rails
   rubyzip
+  sanitize!
   sass-rails (~> 3.2)
   seed_dump (~> 0.5.3)
   simple_calendar (~> 0.1.9)