googleapis
diff --git a/‎noxfile.py
Copy file name to clipboardExpand all lines: noxfile.py
+8Lines changed: 8 additions & 0 deletions b/‎noxfile.py
Copy file name to clipboardExpand all lines: noxfile.py
+8Lines changed: 8 additions & 0 deletions
@@ -79,7 +79,11 @@ def default(session):
         "--cov-append",
         "--cov-config=.coveragerc",
         "--cov-report=",
+<<<<<<< HEAD
         "--cov-fail-under=25",
+=======
+        "--cov-fail-under=20",
+>>>>>>> ad001a8 (feat: updated nox file for docs and docfx and added unit tests for client)
         os.path.join("tests", "unit"),
         *session.posargs
     )
@@ -109,6 +113,7 @@ def docs(session):
     """Build the docs for this library."""
 
     session.install("-e", ".[tracing]")
+<<<<<<< HEAD
     session.install("sphinx", "alabaster", "recommonmark", "django==2.2")
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -139,6 +144,9 @@ def docfx(session):
         "sphinx-docfx-yaml",
         "django==2.2",
     )
+=======
+    session.install("sphinx", "alabaster", "recommonmark")
+>>>>>>> ad001a8 (feat: updated nox file for docs and docfx and added unit tests for client)
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(