successfully adds the new version with the updated name on the projects repo

be3777f7 · tiagonbotelho · bb627b6f · be3777f7
Commit be3777f7 authored Jul 01, 2016 by tiagonbotelho
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

No files found.
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -15,6 +15,12 @@ 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