From 9405106fd8ca6684e97fdc812b195dca3fc7aade Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Sat, 4 Jan 2020 22:03:41 +0100
Subject: [PATCH] git merge message removed

---
 tm/OBSW_TmService3.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tm/OBSW_TmService3.py b/tm/OBSW_TmService3.py
index 03a861e..c40b1af 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
-- 
GitLab