summaryrefslogtreecommitdiff
path: root/app/services/files/base_service.rb
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-07-01 17:53:05 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-07-12 15:24:17 +0100
commit385afc28efcd7b496b0c518a5490716265cdf87c (patch)
tree34ccd6d573d3ae37732c803b9bf82b0316141a6f /app/services/files/base_service.rb
parentbe3777f77857707ad19358c837703d3690b89256 (diff)
downloadgitlab-ce-385afc28efcd7b496b0c518a5490716265cdf87c.tar.gz
remove prints and useless comments
Diffstat (limited to 'app/services/files/base_service.rb')
-rw-r--r--app/services/files/base_service.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index 9abee4e349a..ac5d7ddde02 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -15,12 +15,7 @@ module Files
params[:file_content]
end
-<<<<<<< bb627b6fc24d71a0ee19fd35d987e423a2567c48
-=======
- puts @file_path
-
# Validate parameters
->>>>>>> successfully adds the new version with the updated name on the projects repo
validate
# Create new branch if it different from source_branch