Fix merge conflict.
authorsanjeev <sanjeev@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 4 Nov 2011 12:12:16 +0000 (12:12 +0000)
committersanjeev <sanjeev@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 4 Nov 2011 12:12:16 +0000 (12:12 +0000)
Signed-off-by: Sanjeev BA <as2902.b@samsung.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64723 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 2d73ebd..3027c70 100644 (file)
--- a/AUTHORS
+++ b/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>