From c185e754030949a92781db95f0d6b4e76504d355 Mon Sep 17 00:00:00 2001
From: Chiller Dragon <chillerdragon@gmail.com>
Date: Sat, 23 Oct 2021 11:03:55 +0200
Subject: [PATCH] Make downstream merges easier

---
 src/game/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/version.h b/src/game/version.h
index 765cd8377..16d9295d0 100644
--- a/src/game/version.h
+++ b/src/game/version.h
@@ -7,7 +7,7 @@
 #endif
 #define GAME_VERSION "0.6.4, " GAME_RELEASE_VERSION
 #define GAME_NETVERSION "0.6 626fce9a778df4d4"
-#define GAME_NAME "DDNet"
 #define CLIENT_VERSIONNR 15054
 extern const char *GIT_SHORTREV_HASH;
+#define GAME_NAME "DDNet"
 #endif