Sync BUILD.md with upstream
The only difference with upstream was the accidental addition of some
conflict markers, so remove those.
Change-Id: I43639e6d94edda5d5bdb6a5bb199882d9d1b421a
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/Vulkan-Loader/+/548423
Reviewed-by: Craig Stout <cstout@google.com>
diff --git a/BUILD.md b/BUILD.md
index 15ef777..dd3f641 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -686,8 +686,6 @@
Fuchsia uses the project's GN build system to integrate with the Fuchsia platform build.
-<<<<<<< HEAD
-=======
## Building on QNX
QNX is using its own build system. The proper build environment must be set
@@ -697,7 +695,6 @@
Then change working directory to the "build-qnx" in this project and type "make".
It will build the ICD loader for all CPU targets supported by QNX.
->>>>>>> 64cc17099c41622646e81d5b46cc537e47361f28
### SDK Symbols
The Vulkan Loader is a component of the Fuchsia SDK, so it must explicitly declare its exported symbols in
