Restore the removed file (Azure#26410)

documentation/breaking-changes/upcoming-breaking-changes.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Upcoming breaking changes in Azure PowerShell
 
 ## Az.Accounts
@@ -599,4 +600,34 @@
   - `-File`
     - The parameter File (alias CloudFile) will be deprecated, and ShareFileClient will be mandatory.
     - This change is expected to take effect from Az.Storage version: 8.0.0 and Az version: 13.0.0
+=======
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Upcoming Breaking Changes", and should adhere to the following format:
+
+    # Upcoming Breaking Changes
+
+    ## Release X.0.0 - January 2017
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above section follows the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+# Upcoming Breaking Changes
+>>>>>>> 754580d3e94 (Restore the removed file (#26410))