merge conflict

[xonotic/xonotic-maps.pk3dir.git] / maps / atelier.mapinfo

diff --git a/maps/atelier.mapinfo b/maps/atelier.mapinfo
index 2033746209634cff1dd325c2307edfa4e102b227..4393590704208ef2ff4d2f802be69780b11c1964 100644 (file)
--- a/maps/atelier.mapinfo
+++ b/maps/atelier.mapinfo
@@ -1,6 +1,6 @@
 title Atelier
 description Large map, well suited for team games
-author ShadoW
+author ShadoW, Mirio, Debugger
 cdtrack 19
 has weapons
 gametype dm