Merge pull request #265 from crytic/fix-prev-merge-conflicts

Fix previous merge conflicts in exercises

Author: montyly

program-analysis/echidna/exercises/exercise1/solution.sol

@@ -1,7 +1,5 @@
-//SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity <0.8.0;
-
-import "token.sol";
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.5.0;
 
 import "./token.sol";
 

program-analysis/echidna/exercises/exercise1/template.sol

@@ -1,7 +1,5 @@
-//SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity <0.8.0;
-
-import "token.sol";
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.5.0;
 
 import "./token.sol";
 

program-analysis/echidna/exercises/exercise1/token.sol

@@ -1,5 +1,5 @@
-//SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity <0.8.0;
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.5.0;
 
 contract Ownable {
     address public owner = msg.sender;