remove GIT part 1

2013-02-17 12:16:44 +01:00
parent bcc6de5349
commit 3d60580332
5 changed files with 20 additions and 3 deletions
--- a/6
+++ b/6
@@ -61,7 +61,11 @@ gem "rolify"
 gem "cancan"

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

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