fix: solve conflicts

This commit is contained in:
myhloli
2024-09-12 18:57:41 +08:00
parent c36ce88e43
commit a4c72e2e33
19 changed files with 0 additions and 323 deletions

View File

@@ -660,6 +660,3 @@ if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.
$^1$