Skip to content

Commit

Permalink
issue/hitide-profile-72: fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jbyrne committed Aug 12, 2024
2 parents 3ce11ba + 654df79 commit 085ab93
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@gov.nasa.jpl.podaac/hitide-profile",
"service_name": "hitide-profile",
"version": "4.11.0-4",
"version": "4.11.0-5",
"description": "",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 085ab93

Please sign in to comment.