chore: fix rebase error

Author: crisbeto

src/lib/list/list.ts

@@ -7,7 +7,6 @@ import {
   Directive,
   ElementRef,
   Input,
-  InjectionToken,
   Optional,
   Renderer2,
   AfterContentInit,
@@ -19,15 +18,6 @@ import {MdLine, MdLineSetter, coerceBooleanProperty} from '../core';
 })
 export class MdListDivider {}
 
-/**
- * Token used to inject the list type into child MdListItem components so they can know whether
- * they're in a nav list (and thus should use an MdRipple).
- */
-export const LIST_TYPE_TOKEN = new InjectionToken<string>('list_type');
-
-const NORMAL_LIST_TYPE = 'normal_list_type';
-const NAV_LIST_TYPE = 'nav_list_type';
-
 @Component({
   moduleId: module.id,
   selector: 'md-list, mat-list, md-nav-list, mat-nav-list',