From: Mike Taylor <mike@indexdata.com>
Date: Fri, 14 Nov 2014 12:48:18 +0000 (+0000)
Subject: Resolve conflicts
X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=e6353cd614e8c2566d2562a6725bf854ed3ab3dc;hp=44fd7ae9a3e18745c0ced5cb7898d067d428f618

Resolve conflicts
---

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index ebdd477..3ba0447 100644
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -19,7 +19,7 @@ MaxClients 32
 
 <VirtualHost *:80>
     ServerName irspy.indexdata.com
-    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com
+    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com irspy-dev
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined