From e6639d7a29b02e739ab39385ca57f50526d8b5cb Mon Sep 17 00:00:00 2001 From: fuqiao Date: Fri, 31 Mar 2017 15:27:16 +0800 Subject: Modify Merge Conflict, index file Modify the index file JIRA: HA-28 Change-Id: I96dc82253b871e89285d3aada214731dac9d0ac8 Signed-off-by:fuqiao@chinamobile.com --- docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst | 6 ++---- docs/development/overview/index.rst | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'docs/development') 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) -==================================== -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) -********************************* -OPNFV HA Guest APIs -- Overview -********************************* ********************************************************************* PROPOSAL: Reach-thru Guest Monitoring and Services for High Availability -- cgit 1.2.3-korg