fixed conflict/

This commit is contained in:
Nweni
2019-11-15 13:54:28 +06:30
44 changed files with 933 additions and 400 deletions

View File

@@ -44,7 +44,8 @@ gem 'mini_magick'
gem 'jquery-fileupload-rails', '~> 0.4.7'
#Report and Printing gems
gem 'cups'
#gem 'cups' #remove for cloud installation
gem 'cups', '~>0.0.7'
gem 'prawn'
gem 'prawn-table'
gem 'prawn-qrcode'
@@ -114,6 +115,7 @@ group :development do
gem 'capistrano-bundler'
gem 'capistrano-rails'
gem 'capistrano-rbenv', github: "capistrano/rbenv"
gem 'capistrano3-puma'
end
group :test do