Skip to content

Commit e0c1ae1

Browse files
authored
Merge pull request #23 from marklogic/feature/license
Updated license/notice
2 parents 9c0d8db + 39056a3 commit e0c1ae1

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

LICENSE

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2023 MarkLogic Corporation.
1+
Copyright © 2023 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
22

33
Licensed 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
44

@@ -7,9 +7,8 @@ http://www.apache.org/licenses/LICENSE-2.0
77
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.
88

99

10-
11-
Apache License
12-
Version 2.0, January 2004
10+
Apache License
11+
Version 2.0, January 2004
1312
http://www.apache.org/licenses/
1413
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1514

@@ -69,14 +68,14 @@ To apply the Apache License to your work, attach the following boilerplate notic
6968

7069
Copyright [yyyy] [name of copyright owner]
7170

72-
Licensed under the Apache License, Version 2.0 (the "License");
73-
you may not use this file except in compliance with the License.
71+
Licensed under the Apache License, Version 2.0 (the "License");
72+
you may not use this file except in compliance with the License.
7473
You may obtain a copy of the License at
7574

7675
http://www.apache.org/licenses/LICENSE-2.0
7776

78-
Unless required by applicable law or agreed to in writing, software
79-
distributed under the License is distributed on an "AS IS" BASIS,
80-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
81-
See the License for the specific language governing permissions and
77+
Unless required by applicable law or agreed to in writing, software
78+
distributed under the License is distributed on an "AS IS" BASIS,
79+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
80+
See the License for the specific language governing permissions and
8281
limitations under the License.

NOTICE.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)