Merge branch 'master' of github.com:joaopaulovieira/gandalf

Conflicts: api/handler.go api/handler_test.go webserver/main.go
tsuru · Jul 28, 2014 · 881b399 · 881b399
2 parents ca441e2 + 94e2b74
commit 881b399
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/webserver/main.go b/webserver/main.go
@@ -50,7 +50,10 @@ For an example conf check gandalf/etc/gandalf.conf file.\n %s`
 	router.Get("/repository/:name/tree/:path", http.HandlerFunc(api.GetTree))
 	router.Get("/repository/:name/tree", http.HandlerFunc(api.GetTree))
 	router.Get("/repository/:name/branch", http.HandlerFunc(api.GetBranch))
+<<<<<<< HEAD
 	router.Get("/repository/:name/tag", http.HandlerFunc(api.GetTag))
+=======
+>>>>>>> 94e2b74daca647c70e6e4b0581e5f960737f52e1
 	router.Get("/repository/:name/diff/commits", http.HandlerFunc(api.GetDiff))
 	router.Get("/healthcheck/", http.HandlerFunc(api.HealthCheck))
 	router.Post("/hook/:name", http.HandlerFunc(api.AddHook))