Skip to content
Snippets Groups Projects
Commit 9405106f authored by Robin Mueller's avatar Robin Mueller
Browse files

git merge message removed

parent 24e58d12
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 7 deletions
tm/OBSW_TmService3.py
+ 0
− 7
View file @ 9405106f
# -*- 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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment