Update LICENSE

yutianqaq · Feb 3, 2024 · 44e25b4 · 44e25b4
1 parent c510f29
commit 44e25b4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,10 +1,6 @@
 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