2025 license merge

matt-wigg · matt-wigg · commit c3dd2607860d · 2025-01-04T22:06:37.000-07:00
diff --git a/LICENSE b/LICENSE
@@ -1,10 +1,6 @@
 MIT License
 
-<<<<<<< HEAD
-Copyright (c) 2024 Matthew Wigglesworth
-=======
 Copyright (c) 2025 Matthew Wigglesworth
->>>>>>> 5dc59c23b4b3a0fd2fd5cae9b8d05754b0ff2f92
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
