aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/google/go-github/github/repos_merging.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/google/go-github/github/repos_merging.go')
-rw-r--r--vendor/github.com/google/go-github/github/repos_merging.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/google/go-github/github/repos_merging.go b/vendor/github.com/google/go-github/github/repos_merging.go
index 31f8313..f9aefb4 100644
--- a/vendor/github.com/google/go-github/github/repos_merging.go
+++ b/vendor/github.com/google/go-github/github/repos_merging.go
@@ -33,5 +33,5 @@ func (s *RepositoriesService) Merge(owner, repo string, request *RepositoryMerge
return nil, resp, err
}
- return commit, resp, err
+ return commit, resp, nil
}