Skip to content

Commit

Permalink
Merge pull request #7 from CobusKruger/master
Browse files Browse the repository at this point in the history
Timestamps in the header
  • Loading branch information
CobusKruger authored Jul 6, 2019
2 parents aa4e9b4 + 343442c commit bba3e19
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Nothing for now.

## [2.0.5] - 2019-07-6

Added default config that places a timestamp in the file header.

## [2.0.4] - 2019-07-6

* Allow adding the time stamp to the file output.
* Updated dependencies to fix five vulnerabilities.

## [2.0.3] - 2019-04-19

Updated one of the upstream dependencies to fix a bug causing selected files being included in a file for every configuration.
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Combine Files",
"description": "Create a single combined output file from several input files.",
"icon": "icons/main-icon.png",
"version": "2.0.3",
"version": "2.0.5",
"publisher": "BateleurIO",
"repository": "https://github.com/BateleurIO/vscode-combine-files.git",
"engines": {
Expand Down Expand Up @@ -52,6 +52,7 @@
"* This is a concatenation of all the selected files, including files in subfolders.",
"* The start and end of each file contains a comment with its name, as well as a",
"* print statement.",
"* Generated at: ${now} ",
"***********************************************************************************"
],
"description": "File Header"
Expand Down Expand Up @@ -252,7 +253,7 @@
"vscode": "^1.1.33"
},
"dependencies": {
"@cobuskruger/combine-files": "^1.0.5",
"@cobuskruger/combine-files": "^1.0.6",
"tmp": "0.0.33",
"url-parse": "^1.4.4"
}
Expand Down

0 comments on commit bba3e19

Please sign in to comment.