style

Author: audunn

src/azure-cli/azure/cli/command_modules/netappfiles/_breaking_change.py

@@ -3,8 +3,4 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 from azure.cli.core.breaking_change import register_argument_deprecate
-<<<<<<< HEAD
 register_argument_deprecate('netappfiles volume update', '--remote-volume-resource-id')
-=======
-register_argument_deprecate('netappfiles volume update', '--remote-volume-resource-id')
->>>>>>> c5608151f3 (--remote-volume-resource-id breaking)