Explorar o código

fix merge conflict

Alexander Belanger %!s(int64=3) %!d(string=hai) anos
pai
achega
2fc3a2cf01
Modificáronse 1 ficheiros con 0 adicións e 3 borrados
  1. 0 3
      internal/repository/gorm/migrate.go

+ 0 - 3
internal/repository/gorm/migrate.go

@@ -57,11 +57,8 @@ func AutoMigrate(db *gorm.DB, debug bool) error {
 		&models.StackResource{},
 		&models.StackSourceConfig{},
 		&models.StackEnvGroup{},
-<<<<<<< HEAD
 		&models.DbMigration{},
-=======
 		&models.MonitorTestResult{},
->>>>>>> belanger/recommender-system-2
 		&ints.KubeIntegration{},
 		&ints.BasicIntegration{},
 		&ints.OIDCIntegration{},