| 12345678910111213141516171819202122232425262728293031 |
- <<<<<<< HEAD
- # http://editorconfig.org
- root = true
- [*]
- charset = utf-8
- indent_style = space
- indent_size = 2
- end_of_line = lf
- insert_final_newline = true
- trim_trailing_whitespace = true
- [*.md]
- insert_final_newline = false
- trim_trailing_whitespace = false
- =======
- # http://editorconfig.org
- root = true
- [*]
- charset = utf-8
- indent_style = space
- indent_size = 2
- end_of_line = CRLF
- insert_final_newline = true
- trim_trailing_whitespace = true
- [*.md]
- insert_final_newline = false
- trim_trailing_whitespace = false
- >>>>>>> 4c1812b5a554e059493b686bf2859714aab46f29
|
