From 09926e4f847f1e44cde1c8cd8d9d70f51e74466b Mon Sep 17 00:00:00 2001 From: "Eric Wong (PAX)" Date: Tue, 7 Jan 2020 14:26:40 -0800 Subject: [PATCH] Fix build as a result of merge conflict --- .../Views/GraphingCalculator/EquationInputArea.xaml.h | 2 +- .../Views/GraphingCalculator/GraphingCalculator.xaml.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h index 31a1850..17b5889 100644 --- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h +++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h @@ -8,7 +8,7 @@ #include "CalcViewModel/GraphingCalculator/EquationViewModel.h" #include "CalcViewModel/GraphingCalculator/GraphingCalculatorViewModel.h" #include "EquationStylePanelControl.xaml.h" -#include "CalcViewModel/Common/KeyboardShortcutManager.h" +#include "Common/KeyboardShortcutManager.h" #include "Controls/EquationTextBox.h" #include "Converters/BooleanNegationConverter.h" #include "Controls/MathRichEditBox.h" diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp index 1881394..83a4ad9 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp +++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp @@ -7,7 +7,7 @@ #include "CalcViewModel/Common/TraceLogger.h" #include "CalcViewModel/Common/LocalizationSettings.h" #include "CalcViewModel/Common/LocalizationStringUtil.h" -#include "CalcViewModel/Common/KeyboardShortcutManager.h" +#include "Common/KeyboardShortcutManager.h" #include "CalcViewModel/Common/Automation/NarratorAnnouncement.h" #include "CalcViewModel/Common/Automation/NarratorNotifier.h" #include "Controls/CalculationResult.h"