Fix the merge of kbansal/card branch (2039eab).
authorKshitij Bansal <kbk@google.com>
Wed, 28 Sep 2016 16:03:08 +0000 (12:03 -0400)
committerKshitij Bansal <kbk@google.com>
Wed, 28 Sep 2016 16:14:58 +0000 (12:14 -0400)
commitfe72120c20dc211c7fdf02af7ff1a89527366a47
treef0ccf24e11cdfbbd177239d42865e55e38456e9a
parentebb20bf5d26eb62df7339c8bdccc0b12771809b6
Fix the merge of kbansal/card branch (2039eab).

A bug was introduced in the cleanup process as preparation for the merge
(theory_sets_private.cpp, lines 2502-2508 in this commit).
src/theory/sets/theory_sets_private.cpp
src/theory/sets/theory_sets_private.h
test/regress/regress0/sets/Makefile.am
test/regress/regress0/sets/card-vc6-minimized.smt2 [new file with mode: 0644]