Merge branch 'automate-mccabe-check' into fix_master

WiSchLabs · Dec 19, 2016 · e4b225e · e4b225e
2 parents c15159d + d771675
commit e4b225e
Show file tree

Hide file tree

Showing 89 changed files with 3,167 additions and 2,446 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,6 +5,7 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+max_line_length=120
 insert_final_newline = true
 trim_trailing_whitespace = true
 
@@ -14,4 +15,4 @@ indent_size = 4
 
 [*.yml]
 indent_style = space
-indent_size = 2
+indent_size = 2
diff --git a/.idea/runConfigurations/OFM_unit_tests.xml b/.idea/runConfigurations/OFM_unit_tests.xml