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:
Nweni
2019-12-02 17:43:02 +06:30
parent bf337495c1 cac6994ccb
commit de73bf9f7d
118 changed files with 14390 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/assets.rb
View File

@@ -60,3 +60,7 @@ Rails.application.config.assets.precompile += %w( order_reservation.js )
# --- Reservation ----
Rails.application.config.assets.precompile += %w( reservation.css )
Rails.application.config.assets.precompile += %w( reservation.js )
# --- Foodcourt ----
Rails.application.config.assets.precompile += %w( foodcourt.css )
Rails.application.config.assets.precompile += %w( foodcourt.js )