diff options
Diffstat (limited to 'src/expr/node.cpp')
| -rw-r--r-- | src/expr/node.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/expr/node.cpp b/src/expr/node.cpp index 080623e21..b9d3d13bb 100644 --- a/src/expr/node.cpp +++ b/src/expr/node.cpp @@ -1,3 +1,4 @@ +<<<<<<< .working /********************* */ /** node.cpp ** Original author: mdeters @@ -198,3 +199,5 @@ void Node::debugPrint() { } }/* CVC4 namespace */ +======= +>>>>>>> .merge-right.r241 |