Resolve conflict in changelog

ethereum-mining · Jun 5, 2018 · cd08d16 · cd08d16
1 parent 0efe14b
commit cd08d16
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Stratum nicehash. Avoid recalculating target with every job [[#1156](https://github.com/ethereum-mining/ethminer/pull/1156)].
 - Drop duplicate stratum jobs (pool bug workaround) [[#1161](https://github.com/ethereum-mining/ethminer/pull/1161)].
 - CLI11 command line parsing support added [[#1160](https://github.com/ethereum-mining/ethminer/pull/1160)].
+- Build fixes & improvements [#1214](https://github.com/ethereum-mining/ethminer/pull/1214).
 - Farm mode (get_work): fixed loss of valid shares and increment in stales [[#1215](https://github.com/ethereum-mining/ethminer/pull/1215)].
 ### Removed
 - Disabled Debug configuration for Visual Studio [[#69](https://github.com/ethereum-mining/ethminer/issues/69)] [[#1131](https://github.com/ethereum-mining/ethminer/pull/1131)].