From c0c7bbab3de2fb69bedf38c69c2b832da10da893 Mon Sep 17 00:00:00 2001
From: Lucas Ernesto Kindinger <lek@dinf.ufpr.br>
Date: Wed, 20 Jan 2016 09:56:51 -0200
Subject: [PATCH] Fix merge conflits int routes file
---
config/routes.rb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/config/routes.rb b/config/routes.rb
index 63cc1e236..18bfc6967 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,12 +66,9 @@ Rails.application.routes.draw do
post :like
post :bookmarks
get :collections
-<<<<<<< HEAD
get :download
-=======
resource :chunk, only: [:create, :show]
->>>>>>> master
end
end
--
GitLab