Resolve conflicts

Signed-off-by: Jonas Franz <info@jonasfranz.software>
这个提交包含在:
Jonas Franz
2018-05-19 18:15:09 +02:00
父节点 05df5a7f22
当前提交 e5bde1405f
修改 2 个文件,包含 1 行新增1 行删除
+1 -1
查看文件
@@ -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),
} }