chore: resolve conflicts

nestjs · Jun 15, 2023 · d63ecfa · d63ecfa
2 parents 21fb852 + d524bdf
commit d63ecfa
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/interfaces/config-module-options.interface.ts b/lib/interfaces/config-module-options.interface.ts
@@ -30,11 +30,6 @@ export interface ConfigModuleOptions {
    */
   envFilePath?: string | string[];
 
-  /**
-   * Environment file encoding.
-   */
-  encoding?: string;
-
   /**
    * Custom function to validate environment variables. It takes an object containing environment
    * variables as input and outputs validated environment variables.