From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 17 Sep 2017 15:27:39 +0000 (-0400)
Subject: Fix merge conflict.
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonstat.git;a=commitdiff_plain;h=46766ab3e13c8265330047224d6bb823d5d4aaf1;hp=86a5e102197ad8750b97705cda6b4107b371ebe4

Fix merge conflict.
---