Cleaned up merge conflict messages

FOSSEE · Feb 9, 2022 · df1d5af · df1d5af
1 parent f3b317a
commit df1d5af
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
@@ -18,7 +18,6 @@
 # =========================================================================
 
 import os
-import traceback        # noqa:F401
 
 import traceback
 if os.name == 'nt':     # noqa
@@ -557,31 +556,13 @@ def open_ngspice(self):
 
         if self.projDir is not None:
 
-            self.obj_Mainview.obj_dockarea.ngspiceEditor(self.projDir)
-            if self.obj_Mainview.obj_dockarea.ngspiceEditor(
-                    self.projDir) is False:
-                print(
-                    "No netlist (*.cir.out) file"
-                    "Check netlist file to change simulation parameters."
-                )
-
-                self.msg = QtWidgets.QErrorMessage()
-                self.msg.setModal(True)
-                self.msg.setWindowTitle("Warning Message")
-                self.msg.showMessage(
-                    'No netlist (*.cir.out) file'
-                )
-                self.msg.exec_()
-                return
-=======
             # Edited by Sumanto Kar 25/08/2021
             if self.obj_Mainview.obj_dockarea.ngspiceEditor(
                     self.projDir) is False:
                 print(
                     "No netlist file (*.cir.out)"
                     "Check netlist file to change simulation parameters."
                 )
->>>>>>> master
 
                 self.msg = QtWidgets.QErrorMessage()
                 self.msg.setModal(True)