Mercurial Mercurial > repos > isabelle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove garbage.
authorballarin
Tue, 20 Apr 2010 22:31:08 +0200
changeset 36239 1385c4172d47
parent 36238 344377ce2e0a
child 36240 95a3fac5dcae
Remove garbage.
src/Pure/Isar/locale.ML file | annotate | diff | comparison | revisions 
--- a/src/Pure/Isar/locale.ML	Tue Apr 20 17:07:53 2010 +0200
+++ b/src/Pure/Isar/locale.ML	Tue Apr 20 22:31:08 2010 +0200
@@ -95,15 +95,9 @@
   intros: thm option * thm option,
   axioms: thm list,
   (** dynamic part **)
-(* <<<<<<< local
-  decls: (declaration * serial) list * (declaration * serial) list,
-    (* type and term syntax declarations *)
-  notes: ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * serial) list,
-======= *)
   syntax_decls: (declaration * serial) list,
     (* syntax declarations *)
   notes: ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * serial) list,
-(* >>>>>>> other *)
     (* theorem declarations *)
   dependencies: ((string * morphism) * serial) list
     (* locale dependencies (sublocale relation) *)
isabelle