Fix merge conflicts

.editorconfig

@@ -1,23 +1,23 @@
-; https://editorconfig.org/
-
-root = true
-
-[*]
-insert_final_newline = true
-charset = utf-8
-trim_trailing_whitespace = true
-indent_style = space
-indent_size = 2
-
-[{go.mod,go.sum,*.go}]
-indent_style = tab
-indent_size = 4
-
-[*.md]
-indent_size = 4
-trim_trailing_whitespace = false
-
-[*.py]
-max_line_length = 119
-indent_style = space
-indent_size = 4
+; https://editorconfig.org/
+
+root = true
+
+[*]
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+[{go.mod,go.sum,*.go}]
+indent_style = tab
+indent_size = 4
+
+[*.md]
+indent_size = 4
+trim_trailing_whitespace = false
+
+[*.py]
+max_line_length = 119
+indent_style = space
+indent_size = 4

.gitattributes

@@ -1,2 +1,2 @@
-build/* linguist-detectable=false
-make.bat linguist-detectable=false
+build/* linguist-detectable=false
+make.bat linguist-detectable=false

.github/FUNDING.yml

@@ -1,4 +1,4 @@
-# These are supported funding model platforms
-
-github: [rabbitstack]
-
+# These are supported funding model platforms
+
+github: [rabbitstack]
+

.github/dependabot.yml

@@ -1,12 +1,12 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "13:00"
-    labels:
-      - deps
-    commit-message:
-      prefix: "chore(deps)"
-
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "13:00"
+    labels:
+      - deps
+    commit-message:
+      prefix: "chore(deps)"
+