From 4deb8fd626b8cb0f49d287970b034142039f79f9 Mon Sep 17 00:00:00 2001
From: Wiki Updater <57631841+Catchears@users.noreply.github.com>
Date: Sat, 28 Nov 2020 16:49:24 +0100
Subject: [PATCH] resolve merge conflict

---
 core/assets/contributors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/assets/contributors b/core/assets/contributors
index 880776a1ec..1390999515 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -102,4 +102,5 @@ newlocknew (freesound.org)
 dsmolenaers (freesound.org)
 Headphaze (freesound.org)
 VolasYouKnow
+Ángel Rodríguez Aguilera
 Catchears