Changeset: 81f4887cc998 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81f4887cc998 Modified Files: monetdb5/mal/mal_interpreter.mx monetdb5/optimizer/opt_partition.mx monetdb5/scheduler/run_centipede.mx Branch: default Log Message:
Fix merge errors. diffs (36 lines): diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx --- a/monetdb5/mal/mal_interpreter.mx +++ b/monetdb5/mal/mal_interpreter.mx @@ -2,7 +2,7 @@ The contents of this file are subject to the MonetDB Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +http://www.monetdb.org/Legal/MonetDBLicense Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/monetdb5/optimizer/opt_partition.mx b/monetdb5/optimizer/opt_partition.mx --- a/monetdb5/optimizer/opt_partition.mx +++ b/monetdb5/optimizer/opt_partition.mx @@ -2,7 +2,7 @@ The contents of this file are subject to the MonetDB Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +http://www.monetdb.org/Legal/MonetDBLicense Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/monetdb5/scheduler/run_centipede.mx b/monetdb5/scheduler/run_centipede.mx --- a/monetdb5/scheduler/run_centipede.mx +++ b/monetdb5/scheduler/run_centipede.mx @@ -2,7 +2,7 @@ The contents of this file are subject to the MonetDB Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +http://www.monetdb.org/Legal/MonetDBLicense Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
