From 9936bf69240faaeb67a8990a38f1cfe0ceaded9c Mon Sep 17 00:00:00 2001
From: thomahl <thomahl@stud.ntnu.no>
Date: Thu, 27 Feb 2020 16:30:34 +0100
Subject: [PATCH] fiks etter merge konflikter
---
soitool/main_window.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/soitool/main_window.py b/soitool/main_window.py
index e7bf446..3b9ca7b 100644
--- a/soitool/main_window.py
+++ b/soitool/main_window.py
@@ -9,8 +9,7 @@ import os
from PySide2.QtCore import Qt
from PySide2.QtWidgets import QTabWidget, QWidget, QMainWindow, \
QApplication, QHBoxLayout, QVBoxLayout, QPushButton, QLabel, \
- QAbstractItemView, QListWidget, QListWidgetItem, QAction, \
- QLabel,
+ QAbstractItemView, QListWidget, QListWidgetItem, QAction
from PySide2.QtGui import QIcon
--
GitLab