fix conflict

2019-12-20 14:17:23 +06:30
parent d9bdf834a2 d87ffee65b
commit 54109c5273
120 changed files with 1525 additions and 2572 deletions
--- a/3
+++ b/3
@@ -41,6 +41,9 @@ gem 'material_icons'
 gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2'
 gem 'rack-cors'

+# Multi-tenancy for shops
+gem 'acts_as_tenant'
+
 # image upload
 gem 'carrierwave', '~> 1.0'
 gem 'mini_magick'