From ed5c532490d27e3c35decede29627af1d3373c3c Mon Sep 17 00:00:00 2001
From: Jarka Kadlecova <jarka@gitlab.com>
Date: Wed, 1 Nov 2017 14:51:41 +0100
Subject: fix wrongly resolved conflict

---
 config/routes.rb | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3