aboutsummaryrefslogtreecommitdiff
path: root/lib/core
diff options
context:
space:
mode:
Diffstat (limited to 'lib/core')
-rw-r--r--lib/core/graph.ml1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/core/graph.ml b/lib/core/graph.ml
index 49c161f..f923a4e 100644
--- a/lib/core/graph.ml
+++ b/lib/core/graph.ml
@@ -4,7 +4,6 @@
But not in any other.This can be improved.
*)
-<<<<<<< HEAD
module TermMap = Map.Make(Term)
module TermSet = Set.Make(Term)