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

---
 src/CalcManager/Ratpack/exp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CalcManager/Ratpack/exp.cpp b/src/CalcManager/Ratpack/exp.cpp
index 61be7083..e8002656 100644
--- a/src/CalcManager/Ratpack/exp.cpp
+++ b/src/CalcManager/Ratpack/exp.cpp
@@ -287,7 +287,7 @@ void powrat(_Inout_ PRAT* px, _In_ PRAT y, uint32_t radix, int32_t precision)
     }
 }
 
-void powratPowerOfPowers(_Inout_ PRAT* px, PRAT y, uint32_t radix, int32_t precision)
+void powratPowerOfPowers(_Inout_ PRAT* px, _In_ PRAT y, uint32_t radix, int32_t precision)
 {
     // Prepare rationals
     PRAT yNumerator = nullptr;