From: lianah <lianahady@gmail.com>
Date: Tue, 30 Apr 2013 20:43:09 +0000 (-0400)
Subject: fixed merge conflicts
X-Git-Tag: cvc5-1.0.0~7293
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db93834744ae5e1c93404e6236e1b46348037770;p=cvc5.git

fixed merge conflicts
---

db93834744ae5e1c93404e6236e1b46348037770