fix rebase

Author: zeitlinger

sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridge.java

@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-<<<<<<<< HEAD:sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridge.java
 package io.opentelemetry.instrumentation.sdk;
-========
-package io.opentelemetry.instrumentation.sdk.internal;
->>>>>>>> 9302a53f45 (fix rebase):sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridge.java
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 

sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeBuilder.java

@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-<<<<<<<< HEAD:sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeBuilder.java
 package io.opentelemetry.instrumentation.sdk;
-========
-package io.opentelemetry.instrumentation.sdk.internal;
->>>>>>>> 9302a53f45 (fix rebase):sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeBuilder.java
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 

sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeBuilderTest.java

@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-<<<<<<<< HEAD:sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeBuilderTest.java
 package io.opentelemetry.instrumentation.sdk;
-========
-package io.opentelemetry.instrumentation.sdk.internal;
->>>>>>>> 9302a53f45 (fix rebase):sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeBuilderTest.java
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;

sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeTest.java

@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-<<<<<<<< HEAD:sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeTest.java
 package io.opentelemetry.instrumentation.sdk;
-========
-package io.opentelemetry.instrumentation.sdk.internal;
->>>>>>>> 9302a53f45 (fix rebase):sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeTest.java
 
 import static org.assertj.core.api.Assertions.assertThat;