git merge message removed

tm/OBSW_TmService3.py

 # -*- coding: utf-8 -*-
 """
-<<<<<<< HEAD
-Program: OBSW_TmPacket.py
-Date: 30.12.2019
-Description: Deserialize Housekeeping TM
-Author: R.Mueller
-=======
 Program: OBSW_TmService3.py
 Date: 30.12.2019
 Description: Deserialize Housekeeping TM
 Author: R. Mueller
->>>>>>> mueller_branch
 """
 
 from tm.OBSW_PusTm import PUSTelemetry