Skip to content

Commit 80d3454

Browse files
committed
fix: rsolve conflicts
2 parents 7aabb1b + 9a6add7 commit 80d3454

File tree

5 files changed

+3
-2
lines changed

5 files changed

+3
-2
lines changed
Binary file not shown.
File renamed without changes.

src/contracts/extensions/stata-token/StataTokenV2.sol

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ contract StataTokenV2 is
5959
else _unpause();
6060
}
6161

62+
/// @inheritdoc Rescuable
6263
function whoCanRescue() public view override returns (address) {
6364
return POOL_ADDRESSES_PROVIDER.getACLAdmin();
6465
}

0 commit comments

Comments
 (0)