Merging bugfix

2017-09-14 11:05:04 -05:00
parent 358d4f4f18 fd2d0a81aa
commit 1edd227f13
6 changed files with 377 additions and 331 deletions
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+# editorconfig-tools is unable to ignore longs strings or urls
+max_line_length = null