add conflict resolutuion

chrisjsewell · chrisjsewell · commit ed0fd1a8f5a3 · 2025-08-11T14:35:29.000+02:00
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -7,6 +7,7 @@ build:
 
 python:
   install:
+      - requirements: docs/requirements.txt
       - method: pip
         path: .
         extra_requirements:
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1,2 @@
+# temporary requirement until myst-parser is updated to accept markdown-it-py v4
+git+https://github.com/executablebooks/MyST-Parser.git@update-markdown-parser

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# temporary requirement until myst-parser is updated to accept markdown-it-py v4`
	`2`	`+git+https://github.com/executablebooks/MyST-Parser.git@update-markdown-parser`