<<<<<<< HEAD root=true ======= >>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818 [*] charset = utf-8 indent_size = 3 indent_style = space insert_final_newline = true