-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Qual: Avoid merge conflict with #32534
- Loading branch information
Showing
2 changed files
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ | |
| * Copyright (C) 2012 Cedric Salvador <[email protected]> | ||
| * Copyright (C) 2015 Marcos García <[email protected]> | ||
| * Copyright (C) 2017-2018 Ferran Marcet <[email protected]> | ||
| * Copyright (C) 2018-2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2018-2025 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024-2025 MDW <[email protected]> | ||
| * Copyright (C) 2024 Nick Fragoulis | ||
| * Copyright (C) 2024 Alexandre Spangaro <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| * Copyright (C) 2015 Marcos García <[email protected]> | ||
| * Copyright (C) 2017 Ferran Marcet <[email protected]> | ||
| * Copyright (C) 2018-2025 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024-2025 MDW <[email protected]> | ||
| * Copyright (C) 2024-2025 MDW <[email protected]> | ||
| * Copyright (C) 2024 Josep Lluís Amador <[email protected]> | ||
| * Copyright (C) 2024 Nick Fragoulis | ||
| * | ||
|
|
||