fixed merge conflict
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d8608463 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d8608463 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d8608463 Branch: refs/heads/master Commit: d8608463a47b0b836546a9e25b2318ecb2da5d01 Parents: 5c5dfbf 89ae41b Author: Shad Storhaug <[email protected]> Authored: Thu Apr 27 08:31:51 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Thu Apr 27 08:31:51 2017 +0700 ---------------------------------------------------------------------- LICENSE.txt | 1 - build.bat | 14 ++++++++++++++ src/Lucene.Net.Tests/Support/C5/DropMultiplicity.cs | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d8608463/LICENSE.txt ---------------------------------------------------------------------- diff --cc LICENSE.txt index c3fe22b,6565427..88346fd --- a/LICENSE.txt +++ b/LICENSE.txt @@@ -652,7 -682,7 +652,6 @@@ under the following licens "This product includes software developed by the Egothor Project. http://egothor.sf.net/"; - THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d8608463/build.bat ---------------------------------------------------------------------- diff --cc build.bat index 6bac17f,813f38e..5a3ecad --- a/build.bat +++ b/build.bat @@@ -1,24 -1,20 +1,38 @@@ @echo off GOTO endcommentblock + :: Licensed to the Apache Software Foundation (ASF) under one or more + :: contributor license agreements. See the NOTICE file distributed with + :: this work for additional information regarding copyright ownership. + :: The ASF licenses this file to You under the Apache License, Version 2.0 + :: (the "License"); you may not use this file except in compliance with + :: the License. You may obtain a copy of the License at + :: + :: http://www.apache.org/licenses/LICENSE-2.0 + :: + :: Unless required by applicable law or agreed to in writing, software + :: distributed under the License is distributed on an "AS IS" BASIS, + :: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + :: See the License for the specific language governing permissions and + :: limitations under the License. :: ----------------------------------------------------------------------------------- +:: +:: Licensed to the Apache Software Foundation (ASF) under one or more +:: contributor license agreements. See the NOTICE file distributed with +:: this work for additional information regarding copyright ownership. +:: The ASF licenses this file to You under the Apache License, Version 2.0 +:: (the "License"); you may not use this file except in compliance with +:: the License. You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: +:: ----------------------------------------------------------------------------------- +:: :: This file will build Lucene.Net and create the NuGet packages. :: :: Syntax: http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d8608463/src/Lucene.Net.Tests/Support/C5/DropMultiplicity.cs ---------------------------------------------------------------------- diff --cc src/Lucene.Net.Tests/Support/C5/DropMultiplicity.cs index f1d1b1f,f522c35..64b8329 --- a/src/Lucene.Net.Tests/Support/C5/DropMultiplicity.cs +++ b/src/Lucene.Net.Tests/Support/C5/DropMultiplicity.cs @@@ -1,22 -1,22 +1,22 @@@ /* - Copyright (c) 2003-2016 Niels Kokholm, Peter Sestoft, and Rasmus Lystr�m - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ++ Copyright (c) 2003-2016 Niels Kokholm, Peter Sestoft, and Rasmus Lystrøm + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. */ using System;
