From e69c1fb36c5f0d21a4d63507a6e5096885f6216a Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Tue, 20 Dec 2016 17:49:25 -0800
Subject: [PATCH] refactor(platform-browser): resolver merge conflict for
 tslint (#13601)

---
 modules/@angular/platform-browser/src/browser/browser_adapter.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/@angular/platform-browser/src/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
index 2ad4d606bc..4f0bfbbeeb 100644
--- a/modules/@angular/platform-browser/src/browser/browser_adapter.ts
+++ b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
@@ -82,7 +82,6 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
       if (console.error) {
         console.error(error);
       } else {
-        // tslint:disable-next-line:no-console
         console.log(error);
       }
     }