Resolve conflicts

Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz 2018-05-19 18:15:09 +02:00
parent 05df5a7f22
commit e5bde1405f
No known key found for this signature in database
GPG Key ID: 506AEEBE80BEDECD
2 changed files with 1 additions and 1 deletions

View File

@ -182,7 +182,7 @@ var migrations = []Migration{
NewMigration("add language column for user setting", addLanguageSetting), NewMigration("add language column for user setting", addLanguageSetting),
// v64 -> v65 // v64 -> v65
NewMigration("add multiple assignees", addMultipleAssignees), NewMigration("add multiple assignees", addMultipleAssignees),
// v65 -> v66 // v66 -> v67
NewMigration("add review", addReview), NewMigration("add review", addReview),
} }