AUTHORS modified

diff --git a/AUTHORS b/AUTHORS
index 1fddc8b..9bad23e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -52,8 +52,5 @@ Sanjeev BA <iamsanjeev@gmail.com>
 Hyunsil Park <hyunsil.park@samsung.com>
 Goun Lee <gouni.lee@samsung.com>
 Mikael Sans <sans.mikael@gmail.com>
-<<<<<<< HEAD
-=======
 Doyoun Kang <doyoun.kang@samsung.com>
 M.V.K. Sumanth <sumanth.m@samsung.com> <mvksumanth@gmail.com>
->>>>>>> remotes/origin/upstream