From f6594aaf7b936e9afbf7eafd3da1711910b7ff9a Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Thu, 26 Dec 2024 22:02:53 +0100
Subject: [PATCH] clippy: Merge config files (#3108)

---
 .clippy.toml | 3 +++
 clippy.toml  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 clippy.toml

diff --git a/.clippy.toml b/.clippy.toml
index b95e806a..d82f64bb 100644
--- a/.clippy.toml
+++ b/.clippy.toml
@@ -1 +1,4 @@
 allow-mixed-uninlined-format-args = false
+disallowed-types = [
+    { path = "tower::util::BoxCloneService", reason = "Use our internal BoxCloneService which is Sync" },
+]
diff --git a/clippy.toml b/clippy.toml
deleted file mode 100644
index 62530998..00000000
--- a/clippy.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-disallowed-types = [
-    { path = "tower::util::BoxCloneService", reason = "Use our internal BoxCloneService which is Sync" },
-]