diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-24 21:36:12 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-24 21:36:12 -0500 |
| commit | b56a611cba58c2439dd826415d632f5044283706 (patch) | |
| tree | 94a00624e6f7fa2b11d820ff4ce93a0d9c62e599 /tests/hazmat | |
| parent | dcd29b49bac8d5e896870121d7b1d3703d50d395 (diff) | |
| parent | 12c6d7ebf3b5f65494fce67859f63ca3b7a90030 (diff) | |
| download | cryptography-b56a611cba58c2439dd826415d632f5044283706.tar.gz cryptography-b56a611cba58c2439dd826415d632f5044283706.tar.bz2 cryptography-b56a611cba58c2439dd826415d632f5044283706.zip | |
Merge pull request #1989 from elitest/fixapachelic
Fix dual license in test_dh.py
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/primitives/test_dh.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/hazmat/primitives/test_dh.py b/tests/hazmat/primitives/test_dh.py index 115f3d8c..d8869de9 100644 --- a/tests/hazmat/primitives/test_dh.py +++ b/tests/hazmat/primitives/test_dh.py @@ -1,15 +1,6 @@ -# 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 -# -# 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 is dual licensed under the terms of the Apache License, Version +# 2.0, and the BSD License. See the LICENSE file in the root of this repository +# for complete details. from __future__ import absolute_import, division, print_function |