Update LICENSE

yutianqaq · Feb 3, 2024 · c510f29 · c510f29
2 parents 262f112 + 2e9ced0
commit c510f29
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,10 @@
 MIT License
 
+<<<<<<< HEAD
 Copyright (c) 2023 Nikos Vourdas
+=======
+Copyright (c) 2024 yutianqaq
+>>>>>>> 2e9ced0dcb68793ff7654a85cc3ef3970e821349
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal