Fixed merge conflicts

Packages/vcs/vcs/Canvas.py

@@ -1,5 +1,4 @@
 import warnings
-from pauser import pause
 import numpy.ma
 import MV2
 import numpy
@@ -945,7 +944,6 @@ def getdrawlogo(self):
     def initLogoDrawing(self):
         self.drawLogo = self.enableLogo
 
-
     def update(self, *args, **kargs):
         """
  Function: update                   # Update the VCS Canvas.
@@ -973,7 +971,6 @@ def update(self, *args, **kargs):
 
         return self.backend.update(*args, **kargs)
 
-
     def scriptobject(self, obj, script_filename=None, mode=None):
         """
  Function: scriptobject       # Script a single primary or secondary class object
@@ -1219,7 +1216,6 @@ def taylordiagram(self, *args, **parms):
         arglist = _determine_arg_list('taylordiagram', args)
         return self.__plot(arglist, parms)
 
-
     def createmeshfill(self, name=None, source='default'):
         return vcs.createmeshfill(name, source)
     createmeshfill.__doc__ = vcs.manageElements.createmeshfill.__doc__
@@ -3975,7 +3971,6 @@ def get_selected_display(self):
     def plot_annotation(self, *args):
         self.canvas.plot_annotation(*args)
 
-
     def flush(self, *args):
         """
     The flush command executes all buffered X events in the queue.
@@ -3991,7 +3986,6 @@ def flush(self, *args):
 """
         return self.backend.flush(*args)
 
-
     def geometry(self, *args):
         """
     The geometry command is used to set the size and position of the VCS canvas.
@@ -5241,7 +5235,7 @@ def isinfile(self, GM, file=None):
             if ln.find(key) > -1:
                 f.close()
                 return 1
-        return 0
+        return
 
     def saveinitialfile(self):
         """

Packages/vcs/vcs/VTKPlots.py

@@ -1558,4 +1558,4 @@ def canvasraised(self):
         if self.renWin is None:
             warnings.warn("Cannot raise if you did not open the canvas yet.")
             return
-        self.renWin.MakeCurrent()
+        self.renWin.MakeCurrent()

Packages/vcs/vcs/manageElements.py

@@ -2082,6 +2082,10 @@ def createtextcombined(Tt_name=None, Tt_source='default', To_name=None, To_sourc
 :param projection: Specify a geographic projection used to convert x/y from spherical coordinates into 2D coordinates.
 :type projection: str or projection object
 
+:param projection: ???
+:type projection: ???
+>>>>>>> 350516e7fe7fa36d0cf3452a8cc3bc3104319a1b
+
 :returns: A VCS text object
 :rtype: vcs.textcombined.Tc