summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorSanjeev BA <as2902.b@samsung.com>2011-11-04 12:12:16 +0000
committerSanjeev BA <iamsanjeev@gmail.com>2011-11-04 12:12:16 +0000
commit2319e7fdf60b6315fed1295d966a908a731df682 (patch)
tree19ae25e14eafafead5545a4549dc405b70564fdc /AUTHORS
parent5758381238a317d450c0605ce9ad570e9f2e15c6 (diff)
Fix merge conflict.
Signed-off-by: Sanjeev BA <as2902.b@samsung.com> SVN revision: 64723
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 2d73ebdfb..3027c7057 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,3 +48,4 @@ Guillaume "Kuri" Friloux <guillaume.friloux@asp64.com>
48Kim Yunhan <spbear@gmail.com> 48Kim Yunhan <spbear@gmail.com>
49Bluezery <ohpowel@gmail.com> 49Bluezery <ohpowel@gmail.com>
50Nicolas Aguirre <aguirre.nicolas@gmail.com> 50Nicolas Aguirre <aguirre.nicolas@gmail.com>
51Sanjeev BA <iamsanjeev@gmail.com>