resolve merge conflicts
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 11 Feb 2014 23:10:06 +0000 (17:10 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 11 Feb 2014 23:10:06 +0000 (17:10 -0600)
commitbd0072e146a4ca2acc509af59f745dca7a69ef1d
tree38c7f26e8490f6e0618347218ea1e4206b10e4d6
parent92e4682f1ae3c75548cab4862c929628d03e5dce
resolve merge conflicts
src/theory/strings/theory_strings.cpp