merged, resolving minor conflict, and recovering sane state;
authorwenzelm
Fri, 04 Dec 2009 15:30:36 +0100
changeset 33977 406d8e34a3cf
parent 33976 29b928d32203 (current diff)
parent 33973 78c0842510cb (diff)
child 33978 2380c1dac86e
merged, resolving minor conflict, and recovering sane state;
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