From 29cf978782b683f20a320ef5d1005e40f0acc0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20C=C3=B6kerim?= <kaan.coekerim@rub.de>
Date: Wed, 29 Jun 2022 14:07:06 +0200
Subject: [PATCH] minor bug fixes

---
 pylot/core/io/getEventListFromXML.py | 3 ---
 pylot/core/util/widgets.py           | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pylot/core/io/getEventListFromXML.py b/pylot/core/io/getEventListFromXML.py
index 15e8bfdc..b0497866 100644
--- a/pylot/core/io/getEventListFromXML.py
+++ b/pylot/core/io/getEventListFromXML.py
@@ -8,16 +8,13 @@
    Edited for use in PyLoT
    JG, igem, 01/2022
 """
-<<<<<<< HEAD
 
 import os
 import argparse
 import numpy as np
 import matplotlib.pyplot as plt
-=======
 import glob
 
->>>>>>> 83ba63a3fdd8ad0a212333928cfcd6f45fcb5baa
 from obspy.core.event import read_events
 from pyproj import Proj
 
diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py
index 4b6c2281..452aa560 100644
--- a/pylot/core/util/widgets.py
+++ b/pylot/core/util/widgets.py
@@ -90,6 +90,7 @@ class TextLogWidget(QtWidgets.QTextEdit):
     def __init__(self, parent, highlight_input=False):
         super(TextLogWidget, self).__init__(parent)
         self.highlight_input = highlight_input
+        self.append('DUMMY TEXT\n')
 
     def write(self, text):
         self.append(text)
@@ -107,7 +108,9 @@ class LogWidget(QtWidgets.QWidget):
         self.setMinimumHeight(600)
 
         self.stdout = TextLogWidget(self)
+        self.stdout.write('DUMMY TEXT 2\n')
         self.stderr = TextLogWidget(self, highlight_input=True)
+        self.stderr.write('DUMMY TEXT 2\n')
         self.stderr.highlight.connect(self.active_error)
 
         self.tabs = QTabWidget()
@@ -221,6 +224,7 @@ class AddMetadataWidget(QWidget):
         self.show()
         # self.__test__()
 
+    # TODO: what is this for? Remove?
     def __test__(self):
         self.add_item(r'/rscratch/minos14/marcel/git/pylot/tests')
         self.add_item(r'/rscratch/minos14/marcel/git/pylot/inputs')