From 7b5285a049b6833f8e9c70daf0b26c271aa62ba1 Mon Sep 17 00:00:00 2001
From: Geongi Moon <pillose@naver.com>
Date: Tue, 15 Aug 2023 23:12:39 +0900
Subject: [PATCH] Update package/AUTHORS

Co-authored-by: Rocco Meli <r.meli@bluemail.ch>
---
 package/AUTHORS | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/AUTHORS b/package/AUTHORS
index cd8b2a102a0..2caa064fc70 100644
--- a/package/AUTHORS
+++ b/package/AUTHORS
@@ -219,11 +219,8 @@ Chronological list of authors
   - Daniel J. Evans
   - Mohit Kumar
   - Shubham Kumar
-<<<<<<< HEAD
-  - GeongiMoon
-=======
   - Zaheer Timol
->>>>>>> 66a2b215760750cdf5e62725249c6971e3ac8b34
+  - GeongiMoon
 
 External code
 -------------