Merge "Upgrade E2Mgr spec to version 2.0.5 of 2019-09-11"

author Manoop Talasila <talasila@research.att.com>

Wed, 11 Sep 2019 12:57:45 +0000 (12:57 +0000)

committer Gerrit Code Review <gerrit@o-ran-sc.org>

Wed, 11 Sep 2019 12:57:45 +0000 (12:57 +0000)
author Manoop Talasila <talasila@research.att.com>
Wed, 11 Sep 2019 12:57:45 +0000 (12:57 +0000)
committer Gerrit Code Review <gerrit@o-ran-sc.org>
Wed, 11 Sep 2019 12:57:45 +0000 (12:57 +0000)
diff --cc .gitignore
Simple merge
diff --cc docs/.gitignore

index 89d0765,f6b991e..173f8dc
--- 1/docs/.gitignore
--- 2/docs/.gitignore
+++ b/docs/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
- -/conf.py
+ +/_build
   /out
+ /_build
author	Manoop Talasila <talasila@research.att.com>
	Wed, 11 Sep 2019 12:57:45 +0000 (12:57 +0000)
committer	Gerrit Code Review <gerrit@o-ran-sc.org>
	Wed, 11 Sep 2019 12:57:45 +0000 (12:57 +0000)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
docs/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history