diff options
author | Erik Johnston <erik@matrix.org> | 2023-12-13 15:11:56 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2023-12-13 15:11:56 +0000 |
commit | eaad9bb156d324e35c10b0e9139fb2ce615ecc0b (patch) | |
tree | 4bfe3cf776afcac008d5936fb86a6edb1f97ed3a /rust/benches/evaluator.rs | |
parent | Revert changes to README (diff) | |
parent | Update license headers (diff) | |
download | synapse-eaad9bb156d324e35c10b0e9139fb2ce615ecc0b.tar.xz |
Merge remote-tracking branch 'gitlab/clokep/license-license' into new_develop
Diffstat (limited to 'rust/benches/evaluator.rs')
-rw-r--r-- | rust/benches/evaluator.rs | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/rust/benches/evaluator.rs b/rust/benches/evaluator.rs index 6e1eab2a3b..5e82284358 100644 --- a/rust/benches/evaluator.rs +++ b/rust/benches/evaluator.rs @@ -1,16 +1,22 @@ -// Copyright 2022 The Matrix.org Foundation C.I.C. -// -// 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 licensed under the Affero General Public License (AGPL) version 3. + * + * Copyright (C) 2023 New Vector, Ltd + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * See the GNU Affero General Public License for more details: + * <https://www.gnu.org/licenses/agpl-3.0.html>. + * + * Originally licensed under the Apache License, Version 2.0: + * <http://www.apache.org/licenses/LICENSE-2.0>. + * + * [This file includes modifications made by New Vector Limited] + * + */ #![feature(test)] |