Fix merge errors

2021-01-27 18:04:21 -03:00
parent a0323d446c
commit 5609cd4c74
4 changed files with 4 additions and 4 deletions
--- a/contracts/proxy/Clones.sol
+++ b/contracts/proxy/Clones.sol
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT

-pragma solidity >=0.6.0 <0.9.0;
+pragma solidity ^0.8.0;

 /**
 * @dev https://eips.ethereum.org/EIPS/eip-1167[EIP 1167] is a standard for