From b2e15c648316185da748ea725970a03a16fdc920 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 19 Sep 2015 20:25:07 +0800
Subject: [PATCH] cancan => cancancan

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 49533fb2..7649f497 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '4.2.4'
 gem 'devise'
 gem 'redis'
 gem 'pg'
-gem 'cancan'
+gem 'cancancan'
 gem 'formula'
 gem 'formtastic'
 gem 'json'
diff --git a/Gemfile.lock b/Gemfile.lock
index e6f3af2c..0c82cb5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     builder (3.2.2)
-    cancan (1.6.10)
+    cancancan (1.12.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.7)
@@ -195,7 +195,7 @@ DEPENDENCIES
   aws-sdk
   best_in_place
   better_errors
-  cancan
+  cancancan
   coffee-rails
   devise
   formtastic