From bf9b15d12f0cec62604dc0577e6f9eddce3cec2e Mon Sep 17 00:00:00 2001
From: Eguzki Astiz Lezaun <eastizle@redhat.com>
Date: Thu, 1 Dec 2022 18:57:22 +0100
Subject: [PATCH] Fix opentelemetry-proto file exists check (#1824)

---
 CHANGELOG.md                    | 7 +++++++
 cmake/opentelemetry-proto.cmake | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e878a18e1..90a21e8c3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ Increment the:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 ## [1.8.1] 2022-12-04
 
 * [ETW Exporter] Tail based sampling support [#1780](https://github.com/open-telemetry/opentelemetry-cpp/pull/1780)
@@ -293,6 +294,8 @@ update the semantic convention in instrumentation library is needed.
 >>>>>>> 5407b9d7 ([Logs SDK] LogProcessor, LogExporter changes (#1727))
 =======
 >>>>>>> b18a7edd (Prepare v1.8.0 release (#1813))
+=======
+>>>>>>> 521db474 (Fix opentelemetry-proto file exists check (#1824))
 *   [TRACE SDK] Add trace sdk builders (#1393)
     [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471)
 *   [EXAMPLE] Fix memory ownership of InMemorySpanExporter (#1473)
@@ -319,6 +322,10 @@ update the semantic convention in instrumentation library is needed.
 =======
 =======
 =======
+=======
+* [BUILD] Fix opentelemetry-proto file exists check [#1824](https://github.com/open-telemetry/opentelemetry-cpp/pull/1824)
+
+>>>>>>> 82d8cb49 (Fix opentelemetry-proto file exists check (#1824))
 ## [1.8.0] 2022-11-27
 
 * [DOC] Update Metrics status in README.md [#1722](https://github.com/open-telemetry/opentelemetry-cpp/pull/1722)
diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
index 1e8b7a3fe2..c106c471df 100644
--- a/cmake/opentelemetry-proto.cmake
+++ b/cmake/opentelemetry-proto.cmake
@@ -26,11 +26,15 @@
 #
 
 if(OTELCPP_PROTO_PATH)
+<<<<<<< HEAD
 <<<<<<< HEAD
   if(NOT EXISTS "${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
 =======
   if(NOT EXISTS(${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto))
 >>>>>>> f2b384de ([Build] Bring your own dependency: opentelemetry-proto (#1730))
+=======
+  if(NOT EXISTS "${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
+>>>>>>> 521db474 (Fix opentelemetry-proto file exists check (#1824))
     message(FATAL_ERROR "OTELCPP_PROTO_PATH does not point to a opentelemetry-proto repository")
   endif()
   message(STATUS "opentelemetry-proto dependency satisfied by: external path")