From 30864292ce7de9b609d25aa6286759134d7d2193 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Tue, 15 Apr 2025 15:00:44 -0700
Subject: [PATCH] Fix: cargo fmt merge conflict

---
 packages/manganis/manganis-core/src/asset.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/manganis/manganis-core/src/asset.rs b/packages/manganis/manganis-core/src/asset.rs
index 807c95a74..28434b538 100644
--- a/packages/manganis/manganis-core/src/asset.rs
+++ b/packages/manganis/manganis-core/src/asset.rs
@@ -48,7 +48,7 @@ impl BundledAsset {
     /// Create a new asset but with a relative path
     ///
     /// This method is deprecated and will be removed in a future release.
-   #[deprecated(
+    #[deprecated(
         note = "Relative asset!() paths are not supported. Use a path like `/assets/myfile.png` instead of `./assets/myfile.png`"
     )]
     pub const fn new_relative(