pre fix conflict

go-gitea · yp05327 · May 12, 2023 · May 12, 2023 · May 15, 2023 · May 18, 2023
commit 772638cfd1d2c9694a35c1152f455029f04610d3
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
@@ -491,7 +491,7 @@ var migrations = []Migration{
 	NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
 	// v256 -> v257
 	NewMigration("Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
-	// v257 -> v258
+	// v258 -> v259
 	NewMigration("Drop column NumFollowers and NumFollowing on User", v1_20.DropColumnNumFollowersAndNumFollowingOnUser),
 }
 

diff --git a/models/migrations/v1_20/v257.go → models/migrations/v1_20/v258.go b/models/migrations/v1_20/v257.go → models/migrations/v1_20/v258.go