Merge remote-tracking branch 'origin/master' into 346-add-timeout-configuration

Author: tdstein

CHANGELOG.md

@@ -4,17 +4,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
 ## Unreleased
 
 ### Added
 - The `CONNECT_REQUEST_TIMEOUT` environment variable, which configures the request timeout for all blocking HTTP and HTTPS operations. This value translates into seconds (e.g., `CONNECT_REQUEST_TIMEOUT=60` is equivalent to 60 seconds.) By default, this value is 300. 
+=======
+## [Unreleased]
+
+### Added
+>>>>>>> origin/master
 - Added `deploy voila` command to deploy Jupyter Voila notebooks. 
 
 ### Changed
 - `deploy html` was refactored. Its behavior is described below.
 
+<<<<<<< HEAD
 #### Deploying HTML
 Specifying a directory in the path will result in that entire directory*, subdirectories, and sub contents included in the deploy bundle. The entire directory is included whether or not an entrypoint was supplied
+=======
+### deploy html
+- specifying a directory in the path will result in that entire directory*, subdirectories, and sub contents included in the deploy bundle
+    - the entire directory is included whether or not an entrypoint was supplied
+
+>>>>>>> origin/master
 
 
 e.g.
@@ -68,7 +81,10 @@ rsconnect deploy html -n local ./ -e second.html
 
 *Plus the manifest & other necessary files needed for the bundle to work on Connect.
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
 ## [1.14.1] - 2023-02-09
 
 ### Fixed