From fa9007d721e3b1206cadb4d1572f187942f4b02a Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 12 May 2024 13:04:16 -0700 Subject: [PATCH] chore: format --- .github/workflows/ci.yml | 2 +- CONTRIBUTORS.md | 4 ++-- README.md | 1 + config.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cd686a..54d561a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,4 +22,4 @@ jobs: uses: haraka/.github/.github/workflows/windows.yml@master macos: - uses: haraka/.github/.github/workflows/macos.yml@master \ No newline at end of file + uses: haraka/.github/.github/workflows/macos.yml@master diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ccb3411..9912882 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,7 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (58)|
PSSGCSim (7)|
louis-lau (2)|
baudehlo (1)|
Wesitos (1)|
oreoluwa (1)| -| :---: | :---: | :---: | :---: | :---: | :---: | +|
msimerson (58) |
PSSGCSim (7) |
louis-lau (2) |
baudehlo (1) |
Wesitos (1) |
oreoluwa (1) | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | this file is maintained by [.release](https://github.com/msimerson/.release) diff --git a/README.md b/README.md index 5073396..fa4a168 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,7 @@ These are as you would expect, and returns an object as given in the file. If a requested .json or .hjson file does not exist then the same file will be checked for with a .yaml extension and that will be loaded instead. This is done because YAML files are far easier for a human to write. ### JSON Overrides + You can use JSON, HJSON or YAML files to override any other file by prefixing the outer variable name with a `!` e.g. ```js diff --git a/config.js b/config.js index ab0eb02..c62184e 100644 --- a/config.js +++ b/config.js @@ -159,4 +159,4 @@ function merge_struct(defaults, overrides) { } // JSON overrides needs smtp.(json|yaml) loaded early -module.exports.get('smtp.json'); \ No newline at end of file +module.exports.get('smtp.json')