合并冲突

licp

2024-05-10 3a4041f3eef38f38fa03d6305bea9faead06c133

1
2
3
4
5
6
7
8
9
root = true
 
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true