[UWP] Add accessible names to all action buttons (#3528)

Fixes #3527
microsoft · Nov 1, 2019 · dc90532 · dc90532
1 parent 7609f84
commit dc90532
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/source/uwp/Renderer/lib/ActionHelpers.cpp b/source/uwp/Renderer/lib/ActionHelpers.cpp
@@ -57,15 +57,12 @@ namespace AdaptiveNamespace::ActionHelpers
         THROW_IF_FAILED(action->get_IconUrl(iconUrl.GetAddressOf()));
 
         ComPtr<IButton> localButton(button);
-<<<<<<< HEAD
         ComPtr<IAutomationPropertiesStatics> automationProperties;
         THROW_IF_FAILED(GetActivationFactory(
             HStringReference(RuntimeClass_Windows_UI_Xaml_Automation_AutomationProperties).Get(), &automationProperties));
         ComPtr<IDependencyObject> buttonAsDependencyObject;
         THROW_IF_FAILED(localButton.As(&buttonAsDependencyObject));
         THROW_IF_FAILED(automationProperties->SetName(buttonAsDependencyObject.Get(), title.Get()));
-=======
->>>>>>> 1810703ba... [UWP] Clean up XamlBuilder (#3457)
 
         // Check if the button has an iconUrl
         if (iconUrl != nullptr)