commit a8f4e1d4fcff56fef7bdb90cd2301e0f30e44746
Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date:   Tue Aug 23 13:21:38 2016 +0100

    Fix merge conflict.

diff --git a/core/lib/Drupal/Core/Asset/AssetDumper.php b/core/lib/Drupal/Core/Asset/AssetDumper.php
index 045cce9..533f602 100644
--- a/core/lib/Drupal/Core/Asset/AssetDumper.php
+++ b/core/lib/Drupal/Core/Asset/AssetDumper.php
@@ -16,7 +16,7 @@ class AssetDumper implements AssetDumperInterface {
    * the aggregated contents of the files in $data. This forces proxies and
    * browsers to download new CSS when the CSS changes.
    */
-  public function dump($data, $file_extension) {
+  public function dump($data, $file_extension, $uri = NULL) {
     // Create the css/ or js/ path within the files folder.
     $path = 'public://' . $file_extension;
     if (!isset($uri)) {