Skip to content

Commit e72b2e1

Browse files
author
Andreas
committed
Fix CI/CI merge complaints
1 parent f67bf1a commit e72b2e1

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

copying.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ _the openage authors_ are:
167167
| Jordan Sutton | jsutCodes | jsutcodes à gmail dawt com |
168168
| Daniel Wieczorek | Danio | danielwieczorek96 à gmail dawt com |
169169
| | bytegrrrl | bytegrrrl à proton dawt me |
170-
| Andreas Hellström | Skosulor | andreas dawt ohman à gmail dawt com |
170+
| | hellvoid | hell à void dawt lan |
171+
171172

172173
If you're a first-time committer, add yourself to the above list. This is not
173174
just for legal reasons, but also to keep an overview of all those nicknames.

libopenage/engine/engine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023-2024 the openage authors. See copying.md for legal info.
1+
// Copyright 2023-2025 the openage authors. See copying.md for legal info.
22

33
#include "engine.h"
44

libopenage/engine/engine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023-2024 the openage authors. See copying.md for legal info.
1+
// Copyright 2023-2025 the openage authors. See copying.md for legal info.
22

33
#pragma once
44

libopenage/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015-2024 the openage authors. See copying.md for legal info.
1+
// Copyright 2015-2025 the openage authors. See copying.md for legal info.
22

33
#include "main.h"
44

libopenage/renderer/gui/guisys/private/gui_application_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015-2023 the openage authors. See copying.md for legal info.
1+
// Copyright 2015-2025 the openage authors. See copying.md for legal info.
22

33
#include "gui_application_impl.h"
44

0 commit comments

Comments
 (0)