resolve conflicts

antlr · Jan 8, 2022 · 0cff8dc · 0cff8dc
1 parent 1da60da
commit 0cff8dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/contributors.txt b/contributors.txt
@@ -218,6 +218,7 @@ YYYY/MM/DD, github id, Full name, email
 2019/01/01, khoroshilov, Alexey Khoroshilov, [email protected]
 2019/01/02, wkhemir, Wail Khemir, [email protected]
 2019/01/16, kuegi, Markus Zancolo, [email protected]
+2019/01/29, hc-codersatlas, Harry Chan, [email protected]
 2019/02/06, ralucado, Cristina Raluca Vijulie, ralucris.v[at]gmail[dot]com
 2019/02/23, gedimitr, Gerasimos Dimitriadis, [email protected]
 2019/03/13, base698, Justin Thomas, [email protected]
@@ -325,4 +326,3 @@ YYYY/MM/DD, github id, Full name, email
 2021/12/16, Ketler13, Oleksandr Martyshchenko, [email protected]
 2021/12/25, Tinker1024, Tinker1024, [email protected]
 2021/12/31, Biswa96, Biswapriyo Nath, [email protected]
-2019/01/29, hc-codersatlas, Harry Chan, [email protected]