fix merge conflicts

2023-01-24 10:54:37 +01:00
parent c36e045e99 b4e0e15748
commit 9d2680ba73
2 changed files with 2 additions and 1 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -14,7 +14,7 @@ tests:


    - python -m unittest discover -f ./tests
-    - coverage run --source=./live_display -m unittest discover -f ./tests
+    - coverage run --source=./grum -m unittest discover -f ./tests
    - coverage report
    - coverage xml

--- a/grum/mainwin.py
+++ b/grum/mainwin.py
@ -56,6 +56,7 @@ class MainWindow(QMainWindow):
        rst.server.register_function(self.new_plot)
        rst.server.register_function(self.append_data)

+
        self.sig_make_new_plot.connect(self.on_make_new_plot)

    def keyPressEvent(self, event):