chore: fix merge conflict

aragon · Oct 5, 2023 · 2799899 · 2799899
1 parent 3e1400d
commit 2799899
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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