diff options
Diffstat (limited to 'app/services/files/base_service.rb')
-rw-r--r-- | app/services/files/base_service.rb | 5 |
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 |