resolve config_url problems

2013-02-17 15:46:48 +01:00
parent 3d60580332
commit 5b8b419fa1
6 changed files with 11 additions and 14 deletions
--- a/6
+++ b/6
@@ -61,11 +61,7 @@ gem "rolify"
 gem "cancan"

 # Fileupload
-<<<<<<< HEAD
+
 gem 'paperclip' ,'~>3.4.0'

-# Git
 gem 'git'
-=======
-gem 'paperclip' ,'~>3.4.0'
->>>>>>> parent of 1085698... add GIT gem