From 27998990171cbd9fa5158a66cdaa943ea44f986a Mon Sep 17 00:00:00 2001 From: Mathias Scherer Date: Thu, 5 Oct 2023 10:07:00 +0200 Subject: [PATCH] chore: fix merge conflict --- .../src/core/permission/PermissionConditionUpgradeable.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts/src/core/permission/PermissionConditionUpgradeable.sol b/packages/contracts/src/core/permission/PermissionConditionUpgradeable.sol index 74375c1c9..a1b4e101d 100644 --- a/packages/contracts/src/core/permission/PermissionConditionUpgradeable.sol +++ b/packages/contracts/src/core/permission/PermissionConditionUpgradeable.sol @@ -11,7 +11,7 @@ import {IPermissionCondition} from "./IPermissionCondition.sol"; /// @author Aragon Association - 2023 /// @notice An abstract contract for upgradeable or cloneable contracts to inherit from and to support customary permissions depending on arbitrary on-chain state. /// @custom:security-contact sirt@aragon.org -abstract contract PermissionConditionUpgradeable is ERC165Upgradeable, IPermissionCondition { +abstract contract PermissionConditionUpgradeable is ERC165Upgradeable, IPermissionCondition, ProtocolVersion