From a5dd83efcf277d794da6c08b445ff49b79c0bcdf Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Thu, 5 Jul 2018 10:34:50 +0200 Subject: [PATCH] update routes --- sam/routes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sam/routes.go b/sam/routes.go index e108ae05c..61fc9236a 100644 --- a/sam/routes.go +++ b/sam/routes.go @@ -18,7 +18,6 @@ func MountRoutes(r chi.Router) { r.Get("/search", channel.Search) r.Post("/archive", channel.Archive) r.Post("/move", channel.Move) - r.Post("/merge", channel.Merge) }) r.Route("/message", func(r chi.Router) { r.Post("/edit", message.Edit) @@ -43,6 +42,7 @@ func MountRoutes(r chi.Router) { r.Get("/search", team.Search) r.Post("/archive", team.Archive) r.Post("/move", team.Move) + r.Post("/merge", team.Merge) }) r.Route("/user", func(r chi.Router) { r.Post("/login", user.Login)