From 573f866af10b6127a669d346e8f2c306f00d2ceb Mon Sep 17 00:00:00 2001
From: fuqiao <fuqiao@chinamobile.com>
Date: Fri, 31 Mar 2017 13:52:17 +0800
Subject: Modify git conflict

Modify git conflict

JIRA: HA-28

Change-Id: I283a216b1f97ff9ee225ff9ee92f1e2049383fe3
Signed-off-by:fuqiao@chinamobile.com
---
 docs/development/design/index.rst | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 docs/development/design/index.rst

(limited to 'docs/development/design/index.rst')

diff --git a/docs/development/design/index.rst b/docs/development/design/index.rst
deleted file mode 100644
index e2d3241..0000000
--- a/docs/development/design/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. 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
-*********************************
-
-.. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   OPNFV_HA_Guest_APIs-Base-Messaging-Layer.rst
-   OPNFV_HA_Guest_APIs-server-Group-messaging_HLD.rst
-- 
cgit 1.2.3-korg