merge conflicts

Azure · Nov 6, 2020 · f27e75b · f27e75b
2 parents 804419c + f33efa9
commit f27e75b
Show file tree

Hide file tree

Showing 755 changed files with 5,991 additions and 8,376 deletions.
diff --git a/doc/sphinx/generate_versioned_index.py b/doc/sphinx/generate_versioned_index.py
diff --git a/doc/sphinx/ref/azure.appconfiguration.aio.rst b/doc/sphinx/ref/azure.appconfiguration.aio.rst
diff --git a/doc/sphinx/ref/azure.appconfiguration.rst b/doc/sphinx/ref/azure.appconfiguration.rst
diff --git a/doc/sphinx/ref/azure.applicationinsights.models.rst b/doc/sphinx/ref/azure.applicationinsights.models.rst
diff --git a/doc/sphinx/ref/azure.applicationinsights.operations.rst b/doc/sphinx/ref/azure.applicationinsights.operations.rst
diff --git a/doc/sphinx/ref/azure.applicationinsights.rst b/doc/sphinx/ref/azure.applicationinsights.rst
diff --git a/doc/sphinx/ref/azure.batch.models.rst b/doc/sphinx/ref/azure.batch.models.rst
diff --git a/doc/sphinx/ref/azure.batch.operations.rst b/doc/sphinx/ref/azure.batch.operations.rst
diff --git a/doc/sphinx/ref/azure.batch.rst b/doc/sphinx/ref/azure.batch.rst
diff --git a/doc/sphinx/ref/azure.cognitiveservices.anomalydetector.models.rst b/doc/sphinx/ref/azure.cognitiveservices.anomalydetector.models.rst
diff --git a/doc/sphinx/ref/azure.cognitiveservices.anomalydetector.operations.rst b/doc/sphinx/ref/azure.cognitiveservices.anomalydetector.operations.rst