Revert "Additional changes for the merge"

This reverts commit efb5e1d1cc.
2023-03-25 08:20:34 +01:00
parent efb5e1d1cc
commit abdb43c440
27 changed files with 11178 additions and 1048 deletions
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+charset = utf-8
+insert_final_newline = true