shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

M #-: Drop merge conflict lines

Browse Source
This commit is contained in:
Ruben S. Montero 2021-04-13 11:44:58 +02:00
parent cb0864de08
commit 3763f858a8
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/linters/.rubocop.yml
View File

@ -748,7 +748,6 @@ Style/SoleNestedConditional:
Style/StringConcatenation:
Enabled: false
>>>>>>> one-5.12-new
######
# LINT
@ -855,7 +854,6 @@ Lint/UselessMethodDefinition:
Lint/UselessTimes:
Enabled: true
>>>>>>> one-5.12-new
#########
# METRICS
########

2
src/vm/VirtualMachine.cc
View File

@ -3702,5 +3702,3 @@ void VirtualMachine::rollback_previous_vnc_port()
graphics->remove("PREVIOUS_PORT");
};
>>>>>>> one-5.12-new