From 837cde99a5b3995bddd5ecfbaa48ee19dcd615a1 Mon Sep 17 00:00:00 2001
From: delahaye
Date: Thu, 13 Feb 2003 17:24:40 +0000
Subject: Chargement dynamique de .cma

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3676 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 tactics/tacinterp.ml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'tactics')

diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml
index 3f9ad2fd79..eb29d67edb 100644
--- a/tactics/tacinterp.ml
+++ b/tactics/tacinterp.ml
@@ -772,12 +772,6 @@ let apply_one_mhyp_context ist env gl lmatch mhyp lhyps noccopt =
   and get_info_pattern = function
     | Hyp((_,idpat),pat) -> (Some idpat,pat)
     | NoHypId pat -> (None,pat) in
-
-(*=======
-    | Hyp((_,idpat),_) -> [idpat,VConstr (mkVar id)]
-    | NoHypId _ -> [] in
->>>>>>> 1.28*)
-
   let rec apply_one_mhyp_context_rec ist env mhyp lhyps_acc nocc = function
     | (id,hyp)::tl ->
       (match (get_pattern mhyp) with
-- 
cgit v1.2.3