refactor(platform-browser): resolver merge conflict for tslint (#13601)

2016-12-20 17:49:25 -08:00
parent 44e84d87f9
commit d871ae2dc6
1 changed files with 0 additions and 1 deletions
--- 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);
      }
    }