summaryrefslogtreecommitdiff
path: root/theories/Compat/Coq84.v
diff options
context:
space:
mode:
authorGravatar Enrico Tassi <gareuselesinge@debian.org>2016-01-26 16:56:33 +0100
committerGravatar Enrico Tassi <gareuselesinge@debian.org>2016-01-26 16:56:33 +0100
commit164c6861860e6b52818c031f901ffeff91fca16a (patch)
tree4f91d20c890c25915e7b28226c663b94a8cfb0d3 /theories/Compat/Coq84.v
parent91dbeab8eef959c3f64960909ca69d4e68c8198d (diff)
Imported Upstream version 8.5upstream/8.5
Diffstat (limited to 'theories/Compat/Coq84.v')
-rw-r--r--theories/Compat/Coq84.v6
1 files changed, 1 insertions, 5 deletions
diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v
index b04d5168..90083b00 100644
--- a/theories/Compat/Coq84.v
+++ b/theories/Compat/Coq84.v
@@ -1,6 +1,6 @@
(************************************************************************)
(* v * The Coq Proof Assistant / The Coq Development Team *)
-(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015 *)
+(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016 *)
(* \VV/ **************************************************************)
(* // * This file is distributed under the terms of the *)
(* * GNU Lesser General Public License Version 2.1 *)
@@ -18,10 +18,6 @@ Global Set Asymmetric Patterns.
(** See bug 3545 *)
Global Set Universal Lemma Under Conjunction.
-(** In 8.4, [admit] created a new axiom; in 8.5, it just shelves the goal. *)
-Axiom proof_admitted : False.
-Ltac admit := clear; abstract case proof_admitted.
-
(** In 8.5, [refine] leaves over dependent subgoals. *)
Tactic Notation "refine" uconstr(term) := refine term; shelve_unifiable.