From d34d507579163fefa3795f0956b8196f59f69297 Mon Sep 17 00:00:00 2001
From: Sanjeev BA <as2902.b@samsung.com>
Date: Fri, 4 Nov 2011 12:12:16 +0000
Subject: [PATCH] Fix merge conflict.

Signed-off-by: Sanjeev BA <as2902.b@samsung.com>

SVN revision: 64723
---
 legacy/elementary/AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/legacy/elementary/AUTHORS b/legacy/elementary/AUTHORS
index 2d73ebdfbd..3027c70571 100644
--- a/legacy/elementary/AUTHORS
+++ b/legacy/elementary/AUTHORS
@@ -48,3 +48,4 @@ Guillaume "Kuri" Friloux <guillaume.friloux@asp64.com>
 Kim Yunhan <spbear@gmail.com>
 Bluezery <ohpowel@gmail.com>
 Nicolas Aguirre <aguirre.nicolas@gmail.com>
+Sanjeev BA <iamsanjeev@gmail.com>