mirror of
https://github.com/2dust/v2rayN.git
synced 2025-04-19 05:32:24 +00:00
Resolve merge conflict and set fixed width for Settings menu item
This commit is contained in:
parent
5c310dfe94
commit
d6bd69d631
1 changed files with 1 additions and 2 deletions
|
@ -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">
|
||||
|
|
Loading…
Reference in a new issue