Fix conflict

Signed-off-by: Kyriakos Chatzidimitriou <[email protected]>
src-d · Oct 15, 2019 · 97a5fbe · 97a5fbe
1 parent 9d25295
commit 97a5fbe
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/github/downloader_test.go b/github/downloader_test.go
@@ -34,14 +34,15 @@ import (
 )
 
 const (
-	orgPrefix        = "../testdata/organization_src-d_2019-10-15"
-	repoPrefix       = "../testdata/repository_src-d_gitbase_2019-10-15"
-	orgRecFile       = orgPrefix + ".gob.gz"
-	repoRecFile      = repoPrefix + ".gob.gz"
-	offlineRepoTests = orgPrefix + ".json"
-	offlineOrgTests  = repoPrefix + ".json"
-	onlineRepoTests  = "../testdata/online-repository-tests.json"
-	onlineOrgTests   = "../testdata/online-organization-tests.json"
+	orgPrefix            = "../testdata/organization_src-d_2019-10-15"
+	repoPrefix           = "../testdata/repository_src-d_gitbase_2019-10-15"
+	orgRecFile           = orgPrefix + ".gob.gz"
+	repoRecFile          = repoPrefix + ".gob.gz"
+	offlineRepoTests     = orgPrefix + ".json"
+	offlineOrgTests      = repoPrefix + ".json"
+	onlineRepoTests      = "../testdata/online-repository-tests.json"
+	onlineOrgTests       = "../testdata/online-organization-tests.json"
+	onlineReposListTests = "../testdata/online-repositories-list-tests.json"
 )
 
 // loads requests-response data from a gob file