Changeset: 2d529f962e90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d529f962e90
Modified Files:
clients/Tests/SQL-dump.stable.out
Branch: default
Log Message:
Fix merge.
diffs (11 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1869,7 +1869,6 @@ CREATE TABLE "sys"."args" (
"number" INTEGER
);
COPY 3799 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
-======= end
2155 28 "res_0" "oid" 63 0 0 0
2156 28 "arg_1" "wrd" 64 0 1 1
2157 29 "res_0" "oid" 63 0 0 0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
