rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

(bug) fix merge conflict resolution error

Browse Source
This commit is contained in:
Sylvain 2023-01-30 11:11:23 +01:00
parent f57df4cc6e
commit d58ab30c4e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/setting.rb
View File

@ -172,7 +172,7 @@ class Setting < ApplicationRecord
trainings_authorization_validity trainings_authorization_validity
trainings_authorization_validity_duration trainings_authorization_validity_duration
trainings_invalidation_rule trainings_invalidation_rule
trainings_invalidation_rule_period] } trainings_invalidation_rule_period
trainings_auto_cancel_deadline trainings_auto_cancel_deadline
machines_banner_active machines_banner_active
machines_banner_text machines_banner_text