diff options
Diffstat (limited to 'docs/development/devtools/devtools.rst')
| -rw-r--r-- | docs/development/devtools/devtools.rst | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/development/devtools/devtools.rst b/docs/development/devtools/devtools.rst index 401cfc9e..630d8168 100644 --- a/docs/development/devtools/devtools.rst +++ b/docs/development/devtools/devtools.rst @@ -276,14 +276,11 @@ 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 + cl-participants-smoke.rst policy-participant-smoke.rst - db-migrator-smoke.rst ->>>>>>> CHANGE (33149a Added doc for smoke testing db-migrator) .. api-smoke.rst |