aboutsummaryrefslogtreecommitdiffstats
path: root/docs/development/devtools/devtools.rst
diff options
context:
space:
mode:
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