resolved conflicts

internet2 · Mar 30, 2022 · 7852e58 · 7852e58
2 parents c315286 + 7d4f40b
commit 7852e58
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 115 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@ See ["Caching dependencies to speed up workflows"](https://help.github.com/githu
 
 ## What's New
 ### v3
+* Added support for caching from GHES 3.5.
+* Fixed download issue for files > 2GB during restore.
 * Updated the minimum runner version support from node 12 -> node 16.
 
 ### v2
@@ -175,12 +177,6 @@ steps:
 
 > Note: The `id` defined in `actions/cache` must match the `id` in the `if` statement (i.e. `steps.[ID].outputs.cache-hit`)
 
-## Changelog schedule and history 
-
-| Status  | Version  | Date  | Highlights  |
-|:---|:---|:---|:---|
-| Published  | v3.0.0  | Mar 21st, 2022 | -  Updated minimum runner version support from node 12 -> node 16 <br>  |
-
 ## Contributing
 We would love for you to contribute to `actions/cache`, pull requests are welcome! Please see the [CONTRIBUTING.md](CONTRIBUTING.md) for more information.
 

diff --git a/RELEASES.md b/RELEASES.md
@@ -4,4 +4,5 @@
 - Updated minimum runner version support from node 12 -> node 16
 
 ### 3.0.1
-- Added support for GHES.
+- Added support for caching from GHES 3.5.
+- Fixed download issue for files > 2GB during restore.