summaryrefslogtreecommitdiffstats
path: root/docs/development/devtools/devtools.rst
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2021-11-01 09:46:17 +0000
committerGerrit Code Review <gerrit@onap.org>2021-11-01 09:46:17 +0000
commit5ef89b678708b6cba7c3e646856ed22a7360ff1d (patch)
tree65d99b1cb51a0f4c9b03f61b64276ce06dd03d60 /docs/development/devtools/devtools.rst
parent228dd24a600998b6a01f46d76fa0cdc631627cf0 (diff)
parente7aa0f15b462859358dca48ec5b97c92a5689db9 (diff)
Merge "Added doc for smoke testing db-migrator" into istanbul
Diffstat (limited to 'docs/development/devtools/devtools.rst')
-rw-r--r--docs/development/devtools/devtools.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/development/devtools/devtools.rst b/docs/development/devtools/devtools.rst
index 2351a32d..5d6c94c9 100644
--- a/docs/development/devtools/devtools.rst
+++ b/docs/development/devtools/devtools.rst
@@ -276,6 +276,12 @@ familiar with the Policy Framework components and test any local changes.
.. toctree::
:maxdepth: 1
+<<<<<<< HEAD (25d5a6 Merge "Refactor s3p documents" into istanbul)
+=======
+ policy-gui-controlloop-smoke.rst
+
+ db-migrator-smoke.rst
+>>>>>>> CHANGE (33149a Added doc for smoke testing db-migrator)
..
api-smoke.rst