From 19a6c46280fb1a602aa3e96fbde73a00b15b3cdc Mon Sep 17 00:00:00 2001
From: Tilman Vatteroth <git@tilmanvatteroth.de>
Date: Fri, 11 Nov 2022 11:29:25 +0100
Subject: [PATCH] fix(repository): merge authors file

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
---
 AUTHORS             |  2 ++
 frontend/AUTHORS.md | 19 -------------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 frontend/AUTHORS.md

diff --git a/AUTHORS b/AUTHORS
index cf8d77c8e..650d54fef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,3 +28,5 @@ Simon C <simonc@linux.com>
 Thomas Snowden <zapperchamp1@gmail.com>
 Tilman Vatteroth <git@tilmanvatteroth.de>
 Yannick Bungers <git@innay.de>
+Henrik Hüttemann <admin@herh.de>
+Jakob Klepp <jakob-github@truh.in>
diff --git a/frontend/AUTHORS.md b/frontend/AUTHORS.md
deleted file mode 100644
index bd4991597..000000000
--- a/frontend/AUTHORS.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
-
-SPDX-License-Identifier: CC-BY-SA-4.0
--->
-
-<!--
-This file lists all individuals having contributed content to the repository.
-To regenerate, use `git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf`.
--->
-
-# Authors
-
-- Erik Michelson <github@erik.michelson.eu>
-- Henrik Hüttemann <admin@herh.de>
-- Jakob Klepp <jakob-github@truh.in>
-- Philip Molares <philip.molares@udo.edu>
-- Christoph Kern <sheogorath@shivering-isles.com>
-- Tilman Vatteroth <git@tilmanvatteroth.de>