arduino
diff --git a/‎package-lock.json
Lines changed: 4 additions & 4 deletions b/‎package-lock.json
Lines changed: 4 additions & 4 deletions
diff --git a/‎package.json
Lines changed: 4 additions & 0 deletions b/‎package.json
Lines changed: 4 additions & 0 deletions
@@ -18,7 +18,11 @@
   },
   "homepage": "https://github.com/arduino/docs-content#readme",
   "dependencies": {
+<<<<<<< HEAD
     "@arduino/docs-arduino-cc": "^2.0.18-4",
+=======
+    "@arduino/docs-arduino-cc": "^2.0.18-5",
+>>>>>>> 76df34483 (Bump version)
     "gatsby": "^5.11.0",
     "gatsby-background-image": "^1.6.0",
     "gatsby-image": "^3.11.0",