DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build as a result of merge conflict

Browse Source
This commit is contained in:
Eric Wong (PAX) 2020-01-07 14:26:40 -08:00
parent aad968ff37
commit 09926e4f84
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h
View File

@ -8,7 +8,7 @@
#include "CalcViewModel/GraphingCalculator/EquationViewModel.h" #include "CalcViewModel/GraphingCalculator/EquationViewModel.h"
#include "CalcViewModel/GraphingCalculator/GraphingCalculatorViewModel.h" #include "CalcViewModel/GraphingCalculator/GraphingCalculatorViewModel.h"
#include "EquationStylePanelControl.xaml.h" #include "EquationStylePanelControl.xaml.h"
#include "CalcViewModel/Common/KeyboardShortcutManager.h" #include "Common/KeyboardShortcutManager.h"
#include "Controls/EquationTextBox.h" #include "Controls/EquationTextBox.h"
#include "Converters/BooleanNegationConverter.h" #include "Converters/BooleanNegationConverter.h"
#include "Controls/MathRichEditBox.h" #include "Controls/MathRichEditBox.h"

2
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
View File

@ -7,7 +7,7 @@
#include "CalcViewModel/Common/TraceLogger.h" #include "CalcViewModel/Common/TraceLogger.h"
#include "CalcViewModel/Common/LocalizationSettings.h" #include "CalcViewModel/Common/LocalizationSettings.h"
#include "CalcViewModel/Common/LocalizationStringUtil.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/NarratorAnnouncement.h"
#include "CalcViewModel/Common/Automation/NarratorNotifier.h" #include "CalcViewModel/Common/Automation/NarratorNotifier.h"
#include "Controls/CalculationResult.h" #include "Controls/CalculationResult.h"