Skip to content

H
HEV - High Energy Ventilator
Commit db23207d authored by Benjamin Mummery's avatar Benjamin Mummery 💻
Browse files
Options

removed merge conflict from measurements_widget

parent 0897845f
Pipeline #1199 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 0 additions and 6 deletions
      NativeUI/widget_library/measurements_widget.py
      View file @ db23207d
      ......@@ -37,15 +37,9 @@ class MeasurementsBlockWidget(QtWidgets.QWidget):
      layout = QtWidgets.QGridLayout(self)
      # Create "Measurements" Title
      <<<<<<< HEAD:NativeUI/main_widgets/tab_measurements.py
      title_label = QtWidgets.QLabel(NativeUI.text["layout_label_measurements"]) #
      title_label.setStyleSheet(
      "font-size:" + NativeUI.text_size + ";"
      =======
      self.title_label = QtWidgets.QLabel(NativeUI.text["layout_label_measurements"])
      self.title_label.setStyleSheet(
      # "font-size:" + NativeUI.text_size + ";"
      >>>>>>> ui_dev:NativeUI/widget_library/measurements_widget.py
      "color:" + NativeUI.colors["page_foreground"].name() + ";"
      "background-color:" + NativeUI.colors["page_background"].name() + ";"
      )
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment