From 3a2e21613f7131fa753d9ed0d4e28b5e3520f21e Mon Sep 17 00:00:00 2001
From: leak <leakzx@googlemail.com>
Date: Wed, 16 Feb 2011 13:24:56 +0100
Subject: [PATCH] Contrib/conf_merge: Tab removed and copyright updated (Thanks
 to Aokromes)

---
 contrib/conf_merge/tc-conf-merger.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/conf_merge/tc-conf-merger.pl b/contrib/conf_merge/tc-conf-merger.pl
index a6589b5c674..d4902aba279 100644
--- a/contrib/conf_merge/tc-conf-merger.pl
+++ b/contrib/conf_merge/tc-conf-merger.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
 # Author: leak
 # Date: 2010-12-06
 # Note: Based on conf file format of rev 10507
@@ -33,7 +33,7 @@ my $confold = join "", <CONFOLD>;
 close CONFOLD;
 
 while ($confold =~ m/^(?!#)(.*?)\s+?=\s+?(.*?)$/mg) {
-	my $key = $1, my $value = $2;
+    my $key = $1, my $value = $2;
         $confdist =~ s/^(\Q$key\E)(\s+?=\s+?)(.*)/$1$2$value/mg;
 }