1.1 --- a/src/Pure/Isar/locale.ML	Tue Apr 20 17:07:53 2010 +0200
     1.2 +++ b/src/Pure/Isar/locale.ML	Tue Apr 20 22:31:08 2010 +0200
     1.3 @@ -95,15 +95,9 @@
     1.4    intros: thm option * thm option,
     1.5    axioms: thm list,
     1.6    (** dynamic part **)
     1.7 -(* <<<<<<< local
     1.8 -  decls: (declaration * serial) list * (declaration * serial) list,
     1.9 -    (* type and term syntax declarations *)
    1.10 -  notes: ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * serial) list,
    1.11 -======= *)
    1.12    syntax_decls: (declaration * serial) list,
    1.13      (* syntax declarations *)
    1.14    notes: ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * serial) list,
    1.15 -(* >>>>>>> other *)
    1.16      (* theorem declarations *)
    1.17    dependencies: ((string * morphism) * serial) list
    1.18      (* locale dependencies (sublocale relation) *)