From bf12eb93f3f6a6a824a10878878fadd59745aae0 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sat, 29 Dec 2012 10:57:43 +0100
Subject: Imported Upstream version 8.4pl1dfsg

---
 tactics/auto.ml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tactics/auto.ml')

diff --git a/tactics/auto.ml b/tactics/auto.ml
index 041bb44b..f7d63dcd 100644
--- a/tactics/auto.ml
+++ b/tactics/auto.ml
@@ -1020,6 +1020,7 @@ let auto_unif_flags = {
   use_metas_eagerly_in_conv_on_closed_terms = false;
   modulo_delta = empty_transparent_state;
   modulo_delta_types = full_transparent_state;
+  modulo_delta_in_merge = None;
   check_applied_meta_types = false;
   resolve_evars = true;
   use_pattern_unification = false;
-- 
cgit v1.2.3