diff options
author | fuqiao <fuqiao@chinamobile.com> | 2017-03-31 15:27:16 +0800 |
---|---|---|
committer | fuqiao <fuqiao@chinamobile.com> | 2017-03-31 15:27:16 +0800 |
commit | e6639d7a29b02e739ab39385ca57f50526d8b5cb (patch) | |
tree | 1443ef99b9e72bdd4e7b86340bb95e9943d133cb /docs/development | |
parent | 573f866af10b6127a669d346e8f2c306f00d2ceb (diff) |
Modify Merge Conflict, index filedanube.1.0stable/danube
Modify the index file
JIRA: HA-28
Change-Id: I96dc82253b871e89285d3aada214731dac9d0ac8
Signed-off-by:fuqiao@chinamobile.com
Diffstat (limited to 'docs/development')
-rw-r--r-- | docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst | 6 | ||||
-rw-r--r-- | docs/development/overview/index.rst | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst b/docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst index 17d6ac9..e1fa72c 100644 --- a/docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst +++ b/docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst @@ -1,10 +1,8 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -==================================== -OPNFV HA Guest APIs -- Overview -==================================== -===================================================================== + + Overview ===================================================================== diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst index 01a8ac9..48561d7 100644 --- a/docs/development/overview/index.rst +++ b/docs/development/overview/index.rst @@ -2,9 +2,6 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -********************************* -OPNFV HA Guest APIs -- Overview -********************************* ********************************************************************* PROPOSAL: Reach-thru Guest Monitoring and Services for High Availability |