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 /spec/factories/compliance_controls.rb | |
| parent | 5911206bbadb2c3c9609f8be0ce1affd6584015e (diff) | |
| download | chouette-core-28a352d2c4cba71c796a3504513e0664cec92cb5.tar.bz2 | |
Refs #4615 Resolve rebase conflict
Diffstat (limited to 'spec/factories/compliance_controls.rb')
| -rw-r--r-- | spec/factories/compliance_controls.rb | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb index b1b6bd837..ced505565 100644 --- a/spec/factories/compliance_controls.rb +++ b/spec/factories/compliance_controls.rb @@ -1,7 +1,7 @@  FactoryGirl.define do    factory :compliance_control do      sequence(:name) { |n| "Compliance control #{n}" } -    type "GenericAttributeMinMax" +    type "GenericAttributeControl::MinMax"      criticity :warning      code "code"      origin_code "code"  | 
