From: lianah <lianahady@gmail.com>
Date: Thu, 19 Jun 2014 22:52:55 +0000 (-0400)
Subject: fixed merge conflict
X-Git-Tag: cvc5-1.0.0~6758
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=33324a13308886291d802d69a23993226d557d1a;p=cvc5.git

fixed merge conflict
---

33324a13308886291d802d69a23993226d557d1a