From 83f037c1959efde4bf3fba48dfcc03d0f4871956 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Fri, 29 Jan 2016 17:14:10 -0800 Subject: Cleaned up docs for toolchain errors. Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper Fixed doc formatting errors Change-Id: Ice15401d1c09b9a29e163cbec53e72f53d12b294 Signed-off-by: Trevor Cooper --- docs/specification/objectives.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/specification') diff --git a/docs/specification/objectives.rst b/docs/specification/objectives.rst index efa69ed5..40460ff9 100644 --- a/docs/specification/objectives.rst +++ b/docs/specification/objectives.rst @@ -1,8 +1,13 @@ 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. -- cgit 1.2.3-korg