JCTVC-AJ0028: Update TypeDef.h

Fixed merge conflict message
Status Job ID Name Coverage
  External
passed jenkins