Skip to content
Snippets Groups Projects
Commit ba40f791 authored by François Bobot's avatar François Bobot
Browse files

Merge remote-tracking branch 'origin/learning' into bobot/for_master 

Conflicts:
	src_colibri2/core/demon.ml
	src_colibri2/core/egraph.ml
	src_colibri2/core/egraph.mli
	src_colibri2/core/ground.ml
	src_colibri2/core/ground.mli
	src_colibri2/solver/scheduler.ml
	src_colibri2/theories/ADT/adt.ml
	src_colibri2/theories/bool/boolean.ml
	src_colibri2/theories/bool/equality.ml
parents a89a0221 42a67170
No related branches found
No related tags found
1 merge request!15Start of learning
Pipeline #36127 waiting for manual action
Stage: test
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1438 additions and 321 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment