diff --git a/tm/OBSW_TmService3.py b/tm/OBSW_TmService3.py index 03a861e308a5ef57a7f4786c27c3590ac4fa912b..c40b1af485c7851c83abf5bd3d94d432b0ad9b4a 100644 --- a/tm/OBSW_TmService3.py +++ b/tm/OBSW_TmService3.py @@ -1,16 +1,9 @@ # -*- 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