merge fix after saving

gui/irodsBrowser.py

@@ -283,16 +283,9 @@ class irodsBrowser(QWidget, Ui_tabBrowser):
     def fillInfo(self, index):
         self.__clearErrorLabel()
         self.__clearViewTabs()
-
-<<<<<<< HEAD
-        self.metadataTable.setRowCount(0);
-        self.aclTable.setRowCount(0);
-        self.resourceTable.setRowCount(0);
-=======
-        self.widget.metadataTable.setRowCount(0)
-        self.widget.aclTable.setRowCount(0)
-        self.widget.resourceTable.setRowCount(0)
->>>>>>> master
+        self.metadataTable.setRowCount(0)
+        self.aclTable.setRowCount(0)
+        self.resourceTable.setRowCount(0)
         
         col = index.column()
         row = index.row()
@@ -419,13 +412,8 @@ class irodsBrowser(QWidget, Ui_tabBrowser):
                 self.errorLabel.setText(
                     "IRODS NETWORK ERROR: No Connection, please check network")
             except Exception as error:
-<<<<<<< HEAD
-                print("ERROR upload :", fileSelect[0], "failed; \n\t", repr(error))
-                self.errorLabel.setText(repr(error))
-=======
                 print("ERROR download :", parent+'/'+objName, "failed; \n\t", repr(error))
-                self.widget.errorLabel.setText(repr(error))
->>>>>>> master
+                self.errorLabel.setText(repr(error))
 
 
     #@QtCore.pyqtSlot(QtCore.QModelIndex)

gui/irodsDataCompression.py

@@ -145,12 +145,7 @@ class irodsDataCompression(QWidget, Ui_tabDataCompression):
         stdout, stderr = message
         if success and operation == "create":
             idx, source = self.collectionTreeModel.get_checked()
-<<<<<<< HEAD
-            stdout, stderr = message
             self.createStatusLabel.setText("STATUS: Created " + str(stdout))
-=======
-            self.widget.createStatusLabel.setText("STATUS: Created " + str(stdout))
->>>>>>> master
             parentIdx = self.collectionTreeModel.getParentIdx(idx)
             self.collectionTreeModel.refreshSubTree(parentIdx)
         elif not success and operation == "create":

gui/irodsSearch.py

@@ -4,11 +4,9 @@ from PyQt5.uic import loadUi
 import os
 
 from utils.utils import getDownloadDir
-<<<<<<< HEAD
 from gui.ui_files.searchDialog import Ui_searchDialog
-=======
 import logging
->>>>>>> master
+
 
 class irodsSearch(QDialog, Ui_searchDialog):
     def __init__(self, ic, collTable):

gui/irodsTicketLogin.py

@@ -43,17 +43,10 @@ class irodsTicketLogin(QWidget, Ui_tabTicketAccess):
 
 
     def irodsSession(self):
-<<<<<<< HEAD
         self.infoLabel.clear()
-        host = self.serverEdit.text()
-        path = self.pathEdit.text()
-        token = self.ticketEdit.text()
-=======
-        self.widget.infoLabel.clear()
         host = self.widget.serverEdit.text().strip()
         path = self.widget.pathEdit.text().strip()
         token = self.widget.ticketEdit.text().strip()
->>>>>>> master
 
         try:
             self.ic = irodsConnectorAnonymous(host, token, path)