From 20004050bcd9396f504e3e33138b734d96de5238 Mon Sep 17 00:00:00 2001
From: Vincent_Michael <Vincent_Michael@gmx.de>
Date: Wed, 1 Jan 2014 00:07:53 +0100
Subject: Update copyright note for 2014.

Happy new year.
---
 contrib/conf_merge/tc-conf-merger.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'contrib/conf_merge')

diff --git a/contrib/conf_merge/tc-conf-merger.pl b/contrib/conf_merge/tc-conf-merger.pl
index e2ca3317920..bc0dd44e689 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-2013 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
 # Author: leak
 # Date: 2010-12-06
 # Note: Based on conf file format of rev 10507
-- 
cgit v1.2.3