Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into fixes/2194-prioritize-sign-in-with-browser
  • Loading branch information
jcansdale authored Mar 7, 2020
commit 8ef04eebdb61459630b4b4d7b4e81cc0a81e7e10
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.SignInCustom}">

<Control.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
<ResourceDictionary Source="DialogStyles.xaml" />
</Control.Resources>

<DockPanel Style="{DynamicResource DialogContainerDockPanel}">
Expand All @@ -48,8 +42,7 @@
Style="{DynamicResource GitHubH1TextBlock}"
IsHitTestVisible="False"
Text="{x:Static ghfvs:Resources.LoginLink}" />

<ghfvs:HorizontalShadowDivider />
<controls:HorizontalShadowDivider />
</StackPanel>
<TabControl
x:Name="hostTabControl"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.