git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Aung Myo
2017-06-09 12:04:36 +06:30
parent ba9ebe12de e7a1687b85
commit 406172c6ff
82 changed files with 2071 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/assets.rb
View File

@@ -11,11 +11,11 @@ Rails.application.config.assets.version = '1.0'
# Rails.application.config.assets.precompile += %w( search.js )
# --- Waiter/ Cashier - Orgiami ----
Rails.application.config.assets.precompile += %w( orgiami.css )
Rails.application.config.assets.precompile += %w( orgiami.js )
Rails.application.config.assets.precompile += %w( origami.css )
Rails.application.config.assets.precompile += %w( origami.js )
# -- Order Queue Station -----
Rails.application.config.assets.precompile += %w( OQS.css )
Rails.application.config.assets.precompile += %w( OQS.js )
Rails.application.config.assets.precompile += %w( OQS.js )
Rails.application.config.assets.precompile += %w( settings.css )