[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31864] branches/soc-2010-nicolasbishop/ release/scripts/ui/space_view3d_toolbar.py: == Ptex ==

[Nicholas Bishop]

Revision: 31864
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31864
Author:   nicholasbishop
Date:     2010-09-10 19:54:52 +0200 (Fri, 10 Sep 2010)

Log Message:
-----------
== Ptex ==

Missed a conflict in my last merge

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py

Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py	2010-09-10 17:04:53 UTC (rev 31863)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py	2010-09-10 17:54:52 UTC (rev 31864)
@@ -1035,13 +1035,7 @@
         row.prop(sculpt, "lock_y", text="Y", toggle=True)
         row.prop(sculpt, "lock_z", text="Z", toggle=True)
 
-<<<<<<< .working
-
 class VIEW3D_PT_tools_paint_symmetry(PaintPanel, bpy.types.Panel):
-=======
-
-class VIEW3D_PT_sculpt_symmetry(PaintPanel, bpy.types.Panel):
->>>>>>> .merge-right.r31832
     bl_label = "Symmetry"
     bl_options = {'DEFAULT_CLOSED'}