scons fix

2011-03-17 23:39:26 +00:00
parent 3cb70bd2c5
commit 18494f8d33
1 changed files with 1 additions and 4 deletions
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -21,8 +21,5 @@ if env['BF_NO_ELBEEM']:

 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
+