From 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 Mon Sep 17 00:00:00 2001
From: Matthieu Sozeau
Date: Fri, 8 Nov 2013 11:31:22 +0100
Subject: - Fix bug preventing apply from unfolding Fixpoints. - Remove
 Universe Polymorphism flags everywhere. - Properly infer, discharge template
 arities and fix substitution inside them (kernel code to check for
 correctness). - Fix tactics that were supposing universe polymorphic
 constants/inductives to be parametric on that status. Required to make
 interp_constr* return the whole evar universe context now. - Fix the
 univ/level/instance hashconsing to respect the fact that marshalling doesn't
 preserve sharing, sadly losing most of its benefits. Short-term solution is
 to add hashes to these for faster comparison, longer term requires rewriting
 all serialization code.

Conflicts:
	kernel/univ.ml
	tactics/tactics.ml
	theories/Logic/EqdepFacts.v
---
 theories/Sorting/Permutation.v | 2 +-
 theories/Sorting/Sorted.v      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'theories/Sorting')

diff --git a/theories/Sorting/Permutation.v b/theories/Sorting/Permutation.v
index 899acfc648..a7eddd9f04 100644
--- a/theories/Sorting/Permutation.v
+++ b/theories/Sorting/Permutation.v
@@ -16,7 +16,7 @@
 Require Import List Setoid Compare_dec Morphisms FinFun.
 Import ListNotations. (* For notations [] and [a;b;c] *)
 Set Implicit Arguments.
-Set Universe Polymorphism.
+(* Set Universe Polymorphism. *)
 
 Section Permutation.
 
diff --git a/theories/Sorting/Sorted.v b/theories/Sorting/Sorted.v
index 5b52c6ec9b..beed92b84d 100644
--- a/theories/Sorting/Sorted.v
+++ b/theories/Sorting/Sorted.v
@@ -20,7 +20,7 @@
 
 Require Import List Relations Relations_1.
 
-Set Universe Polymorphism.
+(* Set Universe Polymorphism. *)
 
 (** Preambule *)
 
-- 
cgit v1.2.3