From e5bde1405fddd3fdda88d13f536b3133ce0003e4 Mon Sep 17 00:00:00 2001
From: Jonas Franz <info@jonasfranz.software>
Date: Sat, 19 May 2018 18:15:09 +0200
Subject: [PATCH] Resolve conflicts

Signed-off-by: Jonas Franz <info@jonasfranz.software>
---
 models/migrations/migrations.go      | 2 +-
 models/migrations/{v65.go => v66.go} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename models/migrations/{v65.go => v66.go} (100%)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 06ae9faf42..3aed6f60be 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -182,7 +182,7 @@ var migrations = []Migration{
 	NewMigration("add language column for user setting", addLanguageSetting),
 	// v64 -> v65
 	NewMigration("add multiple assignees", addMultipleAssignees),
-	// v65 -> v66
+	// v66 -> v67
 	NewMigration("add review", addReview),
 }
 
diff --git a/models/migrations/v65.go b/models/migrations/v66.go
similarity index 100%
rename from models/migrations/v65.go
rename to models/migrations/v66.go