fix merge collision

diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 4432893f175ce527a2aa68b1708c8627ce9f1f52..46446d48859c2d7b552717c808fb950302bc5462 100644 (file)
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -1572,11 +1572,9 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
         cache_item(ctx, tnl->vp_cache, hash, key, newProg);
 
          _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg);
-      } else {
-        FREE(key);
       }
       else {
-         FREE(key);
+        FREE(key);
       }
 
       _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg);