Skip to content

Commit cedfd33

Browse files
Resolve merge conflict in LICENSE file, updating license type and copyright holder to OCEAN OF ANYTHING
1 parent 8b3ef2a commit cedfd33

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

LICENSE

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
<<<<<<< HEAD
2-
# MIT License
3-
4-
Copyright (c) 2025 SmartSubAI
5-
=======
6-
MIT License
1+
IT License
72

83
Copyright (c) 2025 OCEAN OF ANYTHING
9-
>>>>>>> 98667251133d2b86284177ed887c781a1115e797
104

115
Permission is hereby granted, free of charge, to any person obtaining a copy
126
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)