fix merge conflict

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: r2readthedocs
 Title: Convert R Package Documentation to a 'readthedocs' Website
-Version: 0.1.0
+Version: 0.1.0.001
 Authors@R: 
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre"))
 Description: Convert R package documentation to a 'readthedocs' website.

codemeta.json

@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/ropenscilabs/r2readthedocs",
   "issueTracker": "https://github.com/ropenscilabs/r2readthedocs/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.0",
+  "version": "0.1.0.001",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
@@ -118,10 +118,14 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=withr"
     },
-    "SystemRequirements": null
+    "SystemRequirements": {}
   },
   "fileSize": "52.94KB",
   "readme": "https://github.com/ropenscilabs/r2readthedocs/blob/main/README.md",
-  "contIntegration": ["https://github.com/ropenscilabs/r2readthedocs/actions", "https://github.com/ropenscilabs/r2readthedocs/actions?query=workflow%3Apkgcheck", "https://codecov.io/gh/ropenscilabs/r2readthedocs"],
+  "contIntegration": [
+    "https://github.com/ropenscilabs/r2readthedocs/actions",
+    "https://github.com/ropenscilabs/r2readthedocs/actions?query=workflow%3Apkgcheck",
+    "https://codecov.io/gh/ropenscilabs/r2readthedocs"
+  ],
   "developmentStatus": "https://www.repostatus.org/#concept"
 }

inst/extdata/readthedocs.yaml

@@ -9,7 +9,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.12"
     # You can also specify other tool versions:
     # nodejs: "20"
     # rust: "1.70"