From: Kshitij Bansal <kshitij@cs.nyu.edu>
Date: Fri, 10 Oct 2014 22:08:56 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/1.4.x'
X-Git-Tag: cvc5-1.0.0~6569
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e91f51cb0e58a9d2d8c1f12e387ca2455d307e4;p=cvc5.git

Merge remote-tracking branch 'origin/1.4.x'
---

4e91f51cb0e58a9d2d8c1f12e387ca2455d307e4
diff --cc test/regress/regress0/Makefile.am
index 89b620655,c0ee0f2bb..e7b8e3b73
--- a/test/regress/regress0/Makefile.am
+++ b/test/regress/regress0/Makefile.am
@@@ -105,8 -105,10 +105,9 @@@ CVC_TESTS = 
  	wiki.19.cvc \
  	wiki.20.cvc \
  	wiki.21.cvc \
 -	simplification_bug3.cvc \
  	queries0.cvc \
- 	print_lambda.cvc
+ 	print_lambda.cvc \
+ 	trim.cvc
  
  # Regression tests for TPTP inputs
  TPTP_TESTS =