From d6bd69d631b7e84364f8b647e7f7b1a8ecde6974 Mon Sep 17 00:00:00 2001
From: Reza Bakhshi Laktasaraei
 <74649066+rezabakhshilaktasaraei@users.noreply.github.com>
Date: Mon, 14 Apr 2025 01:57:36 +0330
Subject: [PATCH] Resolve merge conflict and set fixed width for Settings menu
 item

---
 v2rayN/v2rayN/Views/MainWindow.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 9e82e0af..ab6f0d83 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -147,8 +147,7 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0"
->>>>>>> ce6572af3da479b546bc9ea764a4462050ea0ba5
+                            <MenuItem Padding="8,0" Width="86"
                                       AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">