Update types.ts to remove merged conflict
Update types.ts to remove merged conflict

Remove the whitespace merge conflict which made it into master.
softsimon/angular-2-dropdown-multiselect,softsimon/angular-2-dropdown-multiselect