From: lianah <lianahady@gmail.com>
Date: Sat, 14 Jun 2014 17:53:33 +0000 (-0400)
Subject: fixed merge
X-Git-Tag: cvc5-1.0.0~6815
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d039293e5864502d454c6078790ea403cf3db869;p=cvc5.git

fixed merge
---

d039293e5864502d454c6078790ea403cf3db869