Skip to content

Commit

Permalink
Merge pull request eclipse-openj9#356 from keithc-ca/remove-duplicate…
Browse files Browse the repository at this point in the history
…-copyrights

Remove duplicate copyright notices
  • Loading branch information
pshipton authored Oct 17, 2017
2 parents 48484fe + 08af408 commit b536e6c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 44 deletions.
23 changes: 1 addition & 22 deletions runtime/makelib/mkconstants.mk.ftl
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
<#--
Copyright (c) 1998, 2017 IBM Corp. and others
This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
distribution and is available at https://www.eclipse.org/legal/epl-2.0/
or the Apache License, Version 2.0 which accompanies this distribution and
is available at https://www.apache.org/licenses/LICENSE-2.0.
This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set
forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
General Public License, version 2 with the GNU Classpath
Exception [1] and GNU General Public License, version 2 with the
OpenJDK Assembly Exception [2].
[1] https://www.gnu.org/software/classpath/license.html
[2] http://openjdk.java.net/legal/assembly-exception.html
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-->
# Copyright (c) 1998, ${uma.year} IBM Corp. and others
# Copyright (c) 1998, 2017 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down
23 changes: 1 addition & 22 deletions runtime/makelib/targets.mk.ftl
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
<#--
Copyright (c) 1998, 2017 IBM Corp. and others
This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
distribution and is available at https://www.eclipse.org/legal/epl-2.0/
or the Apache License, Version 2.0 which accompanies this distribution and
is available at https://www.apache.org/licenses/LICENSE-2.0.
This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set
forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
General Public License, version 2 with the GNU Classpath
Exception [1] and GNU General Public License, version 2 with the
OpenJDK Assembly Exception [2].
[1] https://www.gnu.org/software/classpath/license.html
[2] http://openjdk.java.net/legal/assembly-exception.html
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-->
# Copyright (c) 1998, ${uma.year} IBM Corp. and others
# Copyright (c) 1998, 2017 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down

0 comments on commit b536e6c

Please sign in to comment.