Cleanup

2020-06-16 09:58:37 +02:00
parent 7fe18a0037
commit d6a565b2cb
2 changed files with 1 additions and 126 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,9 +1,6 @@
-<<<<<<< HEAD
 root=true
-=======
->>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818
 [*]
 charset = utf-8
 indent_size = 3
 indent_style = space
-insert_final_newline = true
+insert_final_newline = true