Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mpadge committed Sep 5, 2022
2 parents 8995879 + fc7b8cf commit 563a321
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@
"@type": "SoftwareApplication",
"identifier": "typetracer",
"name": "typetracer",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
"name": "Comprehensive R Archive Network (CRAN)",
"url": "https://cran.r-project.org"
},
"sameAs": "https://github.com/mpadge/typetracer"
},
"13": {
Expand All @@ -307,13 +313,10 @@
},
"sameAs": "https://CRAN.R-project.org/package=yaml"
},
"SystemRequirements": {}
"SystemRequirements": null
},
"fileSize": "16405.362KB",
"fileSize": "1989.012KB",
"readme": "https://github.com/ropensci-review-tools/autotest/blob/main/README.md",
"contIntegration": [
"https://github.com/ropensci-review-tools/autotest/actions?query=workflow%3AR-CMD-check",
"https://codecov.io/gh/ropensci-review-tools/autotest"
],
"contIntegration": ["https://github.com/ropensci-review-tools/autotest/actions?query=workflow%3AR-CMD-check", "https://codecov.io/gh/ropensci-review-tools/autotest"],
"developmentStatus": "https://www.repostatus.org/#concept"
}

0 comments on commit 563a321

Please sign in to comment.