fix conflicts

[cdsspec-compiler.git] / model.cc

diff --git a/model.cc b/model.cc
index 24eb83dbbc6515cb4c24730e27ee94c4c949afbe..cec59d52a5579ba651ec2f97cacd689d87da34fe 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -282,8 +282,6 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr)
                                earliest_diverge = prevnode->get_action();
                        }
                }
-               /* Start the round robin scheduler from this thread id */
-               scheduler->set_scheduler_thread(tid);
                /* The correct sleep set is in the parent node. */
                execute_sleep_set();