Skip to content

Commit

Permalink
resolve merge conflicts with master
Browse files Browse the repository at this point in the history
  • Loading branch information
evanshortiss committed Dec 27, 2022
2 parents 55e81a6 + 8cb13c0 commit c452fb9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion API.md
Expand Up @@ -9,7 +9,7 @@ A complete listing of the `env-var` API.
* [get()](#getvarname)
* [variable](#variable)
* [example(string)](#examplestring)
* [default(string)](#defaultstring)
* [default(string)](#defaultdefaultvalue--string)
* [required()](#requiredisrequired--true)
* [covertFromBase64()](#convertfrombase64)
* [asArray()](#asarraydelimiter-string)
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,6 @@
## 7.3.0 (06/09/2022)
* Add missing `asEmailString()` typings (#160)

## 7.2.0 (01/09/2022)
* Add `asEmailString()` accessor (#146)

Expand Down

0 comments on commit c452fb9

Please sign in to comment.