[GRASS-SVN] r42703 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-07-05 08:30:16 +0000 (Mon, 05 Jul 2010)
New Revision: 42703

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py
Log:
rm svn conflict cruft spotted by Massimo

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py	2010-07-04 21:34:19 UTC (rev 42702)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py	2010-07-05 08:30:16 UTC (rev 42703)
@@ -2833,7 +2833,7 @@
             self.mapWindow.Refresh(eraseBackground = False)
         
         event.Skip()
-    
+
 class LightPositionWindow(PositionWindow):
     """!Light position control widget"""
     def __init__(self, parent, mapwindow, id = wx.ID_ANY,
@@ -2857,8 +2857,7 @@
         if event.LeftUp():
             self.mapWindow.render['quick'] = False
             self.mapWindow.Refresh(eraseBackground = False)
-<<<<<<< .working
-        
+
 class NvizPreferencesDialog(PreferencesBaseDialog):
     """!Nviz preferences dialog"""
     def __init__(self, parent, title = _("3D view settings"),