remove prints and useless comments

385afc28 · tiagonbotelho · be3777f7 · 385afc28
Commit 385afc28 authored Jul 01, 2016 by tiagonbotelho
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/services/files/base_service.rb app/services/files/base_service.rb +0 -5

No files found.
--- 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