From c30d329faa41e11277fd19df759290c99244bf70 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 18 Feb 2018 14:18:11 -0800
Subject: [PATCH] fix(ivy): fix merge errors (master is broken) (#22291)

PR Close #22291
---
 .../render3/compiler_canonical/compiler_canonical_spec.ts  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core/test/render3/compiler_canonical/compiler_canonical_spec.ts b/packages/core/test/render3/compiler_canonical/compiler_canonical_spec.ts
index 04cb0ab172..264ab8a649 100644
--- a/packages/core/test/render3/compiler_canonical/compiler_canonical_spec.ts
+++ b/packages/core/test/render3/compiler_canonical/compiler_canonical_spec.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../src/core';
-import * as $r3$ from '../../src/core_render3_private_export';
+import {Component, ContentChild, ContentChildren, Directive, HostBinding, HostListener, Injectable, Input, NgModule, OnDestroy, Optional, Pipe, PipeTransform, QueryList, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '../../../src/core';
+import * as $r3$ from '../../../src/core_render3_private_export';
 
 import {renderComponent, toHtml} from '../render_util';
 
@@ -189,7 +189,8 @@ describe('compiler specification', () => {
           type: HostListenerDir,
           factory: function HostListenerDir_Factory() {
             const $dir$ = new HostListenerDir();
-            $r3$.ɵL('click', function HostListenerDir_click_Handler(event) { $dir$.onClick(); });
+            $r3$.ɵL(
+                'click', function HostListenerDir_click_Handler(event: any) { $dir$.onClick(); });
             return $dir$;
           },
         });