more fixes
This commit is contained in:
@@ -33,10 +33,7 @@ func main() {
|
|||||||
&user.PasswordReset{},
|
&user.PasswordReset{},
|
||||||
&user.Session{},
|
&user.Session{},
|
||||||
&equipment.Equipment{},
|
&equipment.Equipment{},
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
&workout.Workout{},
|
&workout.Workout{},
|
||||||
>>>>>>> 64e8d77 (add routes back)
|
|
||||||
); err != nil {
|
); err != nil {
|
||||||
log.Fatalf("Failed to migrate database: %v", err)
|
log.Fatalf("Failed to migrate database: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user