mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-22 22:23:29 -07:00
Resolve conflict
This commit is contained in:
parent
1419e822b3
commit
f501a55a5d
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue