Merge branch 'next-v5.0' into refator/remove/TokenTimelock

Amxx · Amxx · commit 581e732b9d98 · 2023-05-25T18:27:51.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,7 +42,10 @@ function supportsInterface(bytes4 interfaceId) public view virtual override retu
     return interfaceId == type(MyInterface).interfaceId || super.supportsInterface(interfaceId);
 }
 ```
+<<<<<<< HEAD
 
+=======
+>>>>>>> next-v5.0
 
 ## 4.9.0 (2023-05-23)
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ function supportsInterface(bytes4 interfaceId) public view virtual override retu`
`42`	`42`	`return interfaceId == type(MyInterface).interfaceId \|\| super.supportsInterface(interfaceId);`
`43`	`43`	`}`
`44`	`44`	```
	`45`	`+<<<<<<< HEAD`
`45`	`46`
	`47`	`+=======`
	`48`	`+>>>>>>> next-v5.0`
`46`	`49`
`47`	`50`	`## 4.9.0 (2023-05-23)`
`48`	`51`