X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fspecification%2Fobjectives.rst;fp=docs%2Fspecification%2Fobjectives.rst;h=40460ff95d20f56438e90ec68430340256992b6c;hb=83f037c1959efde4bf3fba48dfcc03d0f4871956;hp=efa69ed5126e670024c1a7176f3c1bd0f5bbff4c;hpb=2a0aa0850096c68372a2630be4b0655dd3c924d1;p=pharos.git

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.