merge to next
This commit is contained in:
commit
6ab2b6b6c3
31 changed files with 17724 additions and 1 deletions
|
|
@ -5,6 +5,11 @@ charset = utf-8
|
|||
|
||||
[*.js]
|
||||
indent_style = tab
|
||||
indent_size = 4
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
<<<<<<< HEAD
|
||||
end_of_line = lf
|
||||
=======
|
||||
end_of_line = crlf
|
||||
>>>>>>> origin/next
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue