summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-11-01 14:51:41 +0100
committerJarka Kadlecova <jarka@gitlab.com>2017-11-01 14:51:41 +0100
commited5c532490d27e3c35decede29627af1d3373c3c (patch)
tree1edfa9f2b51aefe9d55760affa14a781eea45201
parentdbe08ae8aa9343536e1ab7418929b7c48d6490d7 (diff)
downloadgitlab-ce-ed5c532490d27e3c35decede29627af1d3373c3c.tar.gz
fix wrongly resolved conflict
-rw-r--r--config/routes.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 6c5a965feb2..8406372f03f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,7 +100,6 @@ Rails.application.routes.draw do
resources :issues, module: :boards, only: [:index, :update]
end
- draw :google_api
draw :import
draw :uploads
draw :explore