chore(merge): fix merge

Author: amcdnl

src/lib/tabs/tab-content.ts

@@ -1,4 +1,12 @@
-import {Directive, TemplateRef} from '@angular/core';
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+ import {Directive, TemplateRef} from '@angular/core';
 
 @Directive({selector: '[mdTabContent]'})
 export class MdTabContent {