From 18f4e19d65a1248273e93ff20a4e611ff4f470b4 Mon Sep 17 00:00:00 2001
From: uhliksk <37454226+uhliksk@users.noreply.github.com>
Date: Tue, 22 Sep 2020 23:42:08 +0200
Subject: [PATCH] Resolve conflict

---
 src/CalculatorUnitTests/CalculatorManagerTest.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
index c2baca08..66be73cf 100644
--- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp
+++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
@@ -636,13 +636,13 @@ namespace CalculatorManagerTest
         Command commands43[] = { Command::CommandOPENP, Command::Command1, Command::CommandDIV,
             Command::Command9, Command::CommandCLOSEP, Command::CommandSQRT, Command::CommandSUB,
             Command::Command1, Command::CommandDIV, Command::Command3, Command::CommandADD, Command::CommandNULL };
-        TestDriver::Test(L"0", L"\x221A(1 \x00F7 9) - 1 \x00F7 3 + ", commands23, true, true);
+        TestDriver::Test(L"0", L"\x221A(1 \x00F7 9) - 1 \x00F7 3 + ", commands43, true, true);
 
         Command commands44[] = { Command::CommandOPENP, Command::Command2, Command::Command7,
             Command::CommandDIV, Command::Command1, Command::Command2, Command::CommandCLOSEP,
             Command::CommandSQRT, Command::CommandSUB, Command::Command1, Command::CommandPNT, Command::Command5,
             Command::CommandADD, Command::CommandNULL };
-        TestDriver::Test(L"0", L"\x221A(27 \x00F7 12) - 1.5 + ", commands24, true, true);
+        TestDriver::Test(L"0", L"\x221A(27 \x00F7 12) - 1.5 + ", commands44, true, true);
     }
 
     void CalculatorManagerTest::CalculatorManagerTestScientificParenthesis()