fix merge

This commit is contained in:
qwerty287 2024-05-14 08:49:07 +02:00
parent 0971baf749
commit 026c2cac8e
No known key found for this signature in database
GPG key ID: 1218A32A886A5002

View file

@ -113,7 +113,6 @@
"xorm",
"xormigrate",
"zerolog",
<<<<<<< HEAD
"Msgf",
"varchar",
"autoincr",