[eas-cli] Remove git merge artifact from CHANGELOG (#1285)

CHANGELOG.md

@@ -11,7 +11,6 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add metadata support for dynamic store.config.js files. ([#1270](https://github.com/expo/eas-cli/pull/1270) by [@byCedric](https://github.com/byCedric))
 - Improve reliability of update asset presigned upload requests. ([#1278](https://github.com/expo/eas-cli/pull/1278) by [@wschurman](https://github.com/wschurman))
 
->>>>>>> 1ff5f69a (update CHANGELOG.md)
 ### 🐛 Bug fixes
 
 - Rebind `console.info` correctly after `ora` instance stops. ([#1113](https://github.com/expo/eas-cli/pull/1113) by [@EvanBacon](https://github.com/EvanBacon))