summaryrefslogtreecommitdiffstats
path: root/docs/specification/objectives.rst
diff options
context:
space:
mode:
authorTrevor Cooper <trevor.cooper@intel.com>2016-01-29 18:00:42 -0800
committerTrevor Cooper <trevor.cooper@intel.com>2016-01-29 18:00:42 -0800
commitcf3fcd5e4d2e571e0927ccc7f322423eead226e0 (patch)
treed7159133aaae2f012a8d371cfe7df38fbbf41f3b /docs/specification/objectives.rst
parent83f037c1959efde4bf3fba48dfcc03d0f4871956 (diff)
Cleaned up docs for toolchain errors.
Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Cleaned up docs for toolchain errors. Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Fixed doc formatting errors Change-Id: Ice15401d1c09b9a29e163cbec53e72f53d12b294 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Doc formatting issues fixed Change-Id: Id50e3c93fefa3aed492352db013bad3a827b2877 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>
Diffstat (limited to 'docs/specification/objectives.rst')
-rw-r--r--docs/specification/objectives.rst5
1 files changed, 0 insertions, 5 deletions
diff --git a/docs/specification/objectives.rst b/docs/specification/objectives.rst
index 40460ff9..4d7c1199 100644
--- a/docs/specification/objectives.rst
+++ b/docs/specification/objectives.rst
@@ -1,13 +1,8 @@
Objectives / Scope
-------------------
-<<<<<<< HEAD
-The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
-platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
-=======
The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
->>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
management/usage policies and process; and a support plan for reliable access to project and release resources.
Community labs are provided as a service by companies and are not controlled by Pharos however our objective is
to provide easy visibility of all lab capabilities and their usage at all-times.