# HG changeset patch
# User wenzelm
# Date 1259937036 -3600
# Node ID 406d8e34a3cf3c0d2afdddf1723bcfbcc0906e45
# Parent  29b928d32203f73798990ba62507ddd54ec17dce# Parent  78c0842510cbb248518f8ef9bee34a9a4be3f29e
merged, resolving minor conflict, and recovering sane state;

diff -r 29b928d32203 -r 406d8e34a3cf src/Pure/Isar/code.ML
--- a/src/Pure/Isar/code.ML	Fri Dec 04 15:27:45 2009 +0100
+++ b/src/Pure/Isar/code.ML	Fri Dec 04 15:30:36 2009 +0100
@@ -574,7 +574,7 @@
               |> map (fn v => TFree (v, []));
         val ty = typ_subst_TVars (tvars ~~ tvars') raw_ty;
       in raw_typscheme thy (c, ty) end
-  | typscheme_eqns thy c (thms as thm :: _) = typscheme_eqn thy thm;
+  | typscheme_eqns thy c (thm :: _) = typscheme_eqn thy thm;
 
 fun assert_eqns_const thy c eqns =
   let