model-checker : merge conflict resolved

diff --cc src/mc/mc_checkpoint.c
index 1bb54ef,0c611ed..2fbb5be
--- 1/src/mc/mc_checkpoint.c
--- 2/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@@ -108,7 -113,7 +113,6 @@@ void MC_take_snapshot(mc_snapshot_t sna
    /* FIXME: free the memory map */
  }
  
--
  void MC_take_snapshot_liveness(mc_snapshot_t snapshot)
  {
    unsigned int i = 0;

diff --cc src/mc/mc_liveness.c
Simple merge

diff --cc src/mc/mc_private.h
Simple merge