message: Fixed bad CHANGELOG merge.
diff: @@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
  The format is based on [Keep a Changelog](http://keepachangelog.com/)
  and this project adheres to [Semantic Versioning](http://semver.org/).
  -<!-- ## Unreleased -->
  +## Unreleased
  +* Upgraded to `polymer-analyzer@3.0.0-pre.17` and `polymer-bundler@4.0.0-pre.2`.
  +* Converted from `PackageUrlResolver` to `FsUrlResolver` as more appropriate to application build context.
  <!-- Add new, unreleased changes here. -->
  ## [2.5.0] - 2018-03-21
  @@ -21,8 +23,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  * Renamed `jsTransform` option from `compile` to `compileToEs5` to clarify its behavior.
  * Added `transformEsModulesToAmd` option to `jsTransform` and JS stream transformer.
  * Add exponentiation, async/await, and async generator syntax/transform support to `jsTransform`.
  -* Upgraded to `polymer-analyzer@3.0.0-pre.17` and `polymer-bundler@4.0.0-pre.2`.
  -* Converted from `PackageUrlResolver` to `FsUrlResolver` as more appropriate to application build context.
  ## [2.3.3] - 2018-03-14
  * Don't run Babel at all if there are no meaningful changes to make.
  