[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35603] branches/bmesh/blender/source/ blender/modifiers/SConscript: scons fix

[Joseph Eagar]

Revision: 35603
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35603
Author:   joeedh
Date:     2011-03-17 23:39:26 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
scons fix

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/modifiers/SConscript

Modified: branches/bmesh/blender/source/blender/modifiers/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/SConscript	2011-03-17 23:35:51 UTC (rev 35602)
+++ branches/bmesh/blender/source/blender/modifiers/SConscript	2011-03-17 23:39:26 UTC (rev 35603)
@@ -21,8 +21,5 @@
 
 env.BlenderLib ( libname = 'bf_modifiers', sources = sources,
                  includes = Split(incs), defines=defs,
-<<<<<<< .working
-                 libtype=['core','player'], priority = [161, 20] )
-=======
                  libtype=['core','player'], priority = [80, 40] )
->>>>>>> .merge-right.r35190
+