resolved conflicts

Signed-off-by: Matto <muhamadto@gmail.com>

packages/config-loader/src/loader.ts

@@ -24,7 +24,6 @@ import {
   applyConfigTransforms,
   createIncludeTransform,
   createSubstitutionTransform,
-  EnvFunc,
   isValidUrl,
   readEnvConfig,
 } from './lib';
@@ -51,29 +50,6 @@ export type LoadConfigOptionsRemote = {
   reloadIntervalSeconds: number;
 };
 
-/** @public */
-export type RemoteConfigProp = {
-  /**
-   * URL of the remote config
-   */
-  url: string;
-
-  /**
-   * Contents of the remote config
-   */
-  content: string | null;
-
-  /**
-   * An optional new ETag header value. Used when checking for updated config.
-   */
-  newETag?: string;
-
-  /**
-   * An optional old ETag header value. Used when checking for updated config
-   */
-  oldETag?: string;
-};
-
 /**
  * Options that control the loading of configuration files in the backend.
  *
@@ -229,7 +205,10 @@ export async function loadConfig(
     try {
       remoteConfigs = await loadRemoteConfigFiles();
     } catch (error) {
-      throw new ForwardedError(`Failed to read remote configuration file, ${error}`);
+      throw new ForwardedError(
+        `Failed to read remote configuration file`,
+        error,
+      );
     }
   }