Changeset: 42ec140645c8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/42ec140645c8 Modified Files: sql/test/nested/Tests/All Branch: nestedtypes Log Message:
fixed conflict diffs (14 lines): diff --git a/sql/test/nested/Tests/All b/sql/test/nested/Tests/All --- a/sql/test/nested/Tests/All +++ b/sql/test/nested/Tests/All @@ -2,10 +2,6 @@ simple basic fileloader webclicks -<<<<<<< working copy -#array -======= array composite inserts ->>>>>>> merge rev _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
