diff options
| author | cedricnjanga | 2017-09-27 16:34:02 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-09-27 16:34:02 +0200 |
| commit | 28a352d2c4cba71c796a3504513e0664cec92cb5 (patch) | |
| tree | 7b37584f2d219df5d580152008f2778d9d9bb0ee /app/controllers/compliance_controls_controller.rb | |
| parent | 5911206bbadb2c3c9609f8be0ce1affd6584015e (diff) | |
| download | chouette-core-28a352d2c4cba71c796a3504513e0664cec92cb5.tar.bz2 | |
Refs #4615 Resolve rebase conflict
Diffstat (limited to 'app/controllers/compliance_controls_controller.rb')
| -rw-r--r-- | app/controllers/compliance_controls_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index b4fb2f1de..eb1ba68ea 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -4,7 +4,7 @@ class ComplianceControlsController < BreadcrumbController def new @compliance_control_set = parent - @compliance_control = GenericAttributeMinMax.new + @compliance_control = GenericAttributeControl::MinMax.new @compliance_control.build_compliance_control_block end |