Update package/AUTHORS

Co-authored-by: Rocco Meli <[email protected]>
pillose · Aug 15, 2023 · 7b5285a · 7b5285a
1 parent 3454ceb
commit 7b5285a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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
 -------------