diff options
| author |   fuqiao <fuqiao@chinamobile.com> | 2017-03-31 13:52:17 +0800 |
|---|---|---|
| committer | fuqiao <fuqiao@chinamobile.com> | 2017-03-31 13:52:17 +0800 |
| commit | 573f866af10b6127a669d346e8f2c306f00d2ceb (patch) | |
| tree | 55dbb28925b87873720324e26649d8f4e08bc916 /docs/development/overview/index.rst | |
| parent | 08274b14ccc7531208693a9a09d8c9ab3bdf8b3b (diff) | |
Modify git conflict
Modify git conflict
JIRA: HA-28
Change-Id: I283a216b1f97ff9ee225ff9ee92f1e2049383fe3
Signed-off-by:fuqiao@chinamobile.com
Diffstat (limited to 'docs/development/overview/index.rst')
| -rw-r--r-- | docs/development/overview/index.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst index 97fc100..01a8ac9 100644 --- a/docs/development/overview/index.rst +++ b/docs/development/overview/index.rst @@ -2,16 +2,14 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -<<<<<<< HEAD ********************************* OPNFV HA Guest APIs -- Overview ********************************* -======= ********************************************************************* PROPOSAL: Reach-thru Guest Monitoring and Services for High Availability ********************************************************************* ->>>>>>> e83e826... Modify format issues + .. toctree:: :maxdepth: 4 |