From 253fb1724434f70e2d51e73696a82c7feef4497f Mon Sep 17 00:00:00 2001
From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Mon, 25 Mar 2013 23:29:42 +0100
Subject: [PATCH] model-checker : add variable deleted before to resolve a
 merge conflict

---
 src/mc/mc_dpor.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 9d1cd28c35..3e1b700f18 100644
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -254,6 +254,7 @@ void MC_dpor(void)
   xbt_fifo_item_t item = NULL;
   int pos;
   int visited_state;
+  int max_depth_reached = 0;
 
   while (xbt_fifo_size(mc_stack_safety) > 0) {
 
-- 
2.20.1