From efe7d76fbcb7dabf79200e0ac387a8778c4cfe9e Mon Sep 17 00:00:00 2001
From: zedddie <rust@zedddie.rs>
Date: Wed, 25 Mar 2026 12:58:21 +0100
Subject: some merge conflicts

---
 src/geoparsers/v2ray/types.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/geoparsers/v2ray')

diff --git a/src/geoparsers/v2ray/types.rs b/src/geoparsers/v2ray/types.rs
index b82fbbf..d7c0436 100644
--- a/src/geoparsers/v2ray/types.rs
+++ b/src/geoparsers/v2ray/types.rs
@@ -33,7 +33,17 @@ pub mod domain {
         }
     }
     /// Type of domain value.
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[derive(
+        Clone,
+        Copy,
+        Debug,
+        PartialEq,
+        Eq,
+        Hash,
+        PartialOrd,
+        Ord,
+        ::prost::Enumeration
+    )]
     #[repr(i32)]
     pub enum Type {
         /// The value is used as is.
-- 
cgit v1.2.3