Fix conflict

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

diff --git a/maps/boil.mapinfo b/maps/boil.mapinfo
index 914c96ff1354b58451bc39fa8e92daafae6cb46a..a991cb923508a44b5b23019aa677ffef50e278c5 100644 (file)
--- a/maps/boil.mapinfo
+++ b/maps/boil.mapinfo
@@ -1,7 +1,7 @@
 title Boil
-description Stay calm and watch how your enemy is boiling with anger. This is the moment you know you can beat them.
-author kuniu the frogg
-cdtrack 15
+description Stay calm and watch how your enemy is boiling with anger. This is the moment you know you can beat them
+author kuniu the frogg, Mirio
+cdtrack 18
 has weapons
 gametype dm
 gametype tdm