v1.2

Gui/button.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+<<<<<<< HEAD
 ################################################################################
 ## Form generated from reading UI file 'button.ui'
 ##
@@ -45,3 +46,37 @@ def retranslateUi(self, Form):
         self.label.setText(QCoreApplication.translate("Form", u"TextLabel", None))
     # retranslateUi
 
+=======
+# Form implementation generated from reading ui file 'button.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.4
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(102, 41)
+        Form.setMaximumSize(QtCore.QSize(102, 41))
+        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.label = QtWidgets.QLabel(Form)
+        self.label.setMaximumSize(QtCore.QSize(50, 50))
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.label.setText(_translate("Form", "TextLabel"))
+>>>>>>> origin/main

Gui/main.ui

@@ -30,7 +30,11 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget_2">
       <property name="currentIndex">
+<<<<<<< HEAD
        <number>1</number>
+=======
+       <number>0</number>
+>>>>>>> origin/main
       </property>
       <widget class="QWidget" name="tab_3">
        <attribute name="title">
@@ -176,7 +180,11 @@
            <widget class="QCheckBox" name="checkBox_line">
             <property name="maximumSize">
              <size>
+<<<<<<< HEAD
               <width>16777215</width>
+=======
+              <width>100</width>
+>>>>>>> origin/main
               <height>16777215</height>
              </size>
             </property>
@@ -513,7 +521,11 @@
            <bool>true</bool>
           </property>
           <attribute name="horizontalHeaderVisible">
+<<<<<<< HEAD
            <bool>false</bool>
+=======
+           <bool>true</bool>
+>>>>>>> origin/main
           </attribute>
           <attribute name="horizontalHeaderCascadingSectionResizes">
            <bool>true</bool>

conf/config.ini

@@ -1,10 +1,17 @@
 [Setting]
 python3 = python3
 python2 = python2
+<<<<<<< HEAD
 java8 = HOAMCQNgn7UHaPmxwwtbypZw9teXUNF1
+=======
+java8 = xxxxxxxxx
+>>>>>>> origin/main
 java9 = /Modules/Plugins/Censys_Plugins.py
 java14 = /Modules/Plugins/Censys_Plugins.py
 java16 = /Modules/Plugins/Censys_Plugins.py
 column_num = 4
+<<<<<<< HEAD
 qss = mac.qss
+=======
+>>>>>>> origin/main