Resolve conflict

This commit is contained in:
uhliksk 2020-09-22 23:40:24 +02:00 committed by GitHub
commit f501a55a5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 // Prepare rationals
PRAT yNumerator = nullptr; PRAT yNumerator = nullptr;