Skip to content

Commit

Permalink
Merge branch 'main' into rm-scalar
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Nov 25, 2024
2 parents a9a26da + 0e64ff5 commit aff3957
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-pip-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
CI/clang_tidy
CI/fpe_masks
docs
Examples/Python/tests/
Examples/Python/tests
Examples/Scripts
)
for folder in "${folder_list[@]}"; do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

// This file is part of the Acts project.
//
// Copyright (C) 2024 CERN for the benefit of the Acts project
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

#pragma once

#include "Acts/Definitions/Algebra.hpp"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Contributors to the Acts project are listed in the [AUTHORS](AUTHORS) file.

The Acts project is published under the terms of the Mozilla Public License, v. 2.0.
A copy of the license can be found in the [LICENSE](LICENSE) file or at
http://mozilla.org/MPL/2.0/ .
https://mozilla.org/MPL/2.0/ .

The Acts project contains copies of the following external packages:

Expand Down
2 changes: 1 addition & 1 deletion docs/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ License
=======

ACTS is licensed under the `Mozilla Public License Version 2.0
<http://mozilla.org/MPL/2.0/>`_. The full text of the license can be found
<https://mozilla.org/MPL/2.0/>`_. The full text of the license can be found
below.

.. literalinclude:: ../LICENSE
Expand Down

0 comments on commit aff3957

Please sign in to comment.