Решение конфликтов

foliant-docs · Mar 25, 2024 · 78d1218 · 78d1218
2 parents abc7d7b + cafcbf1
commit 78d1218
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ Text below is taken from a remote repository on the default branch.
 >
 > For projects in GitHub, you must specify the full path to the raw file, while not specifying the file extension `.md`.
 
-``` markdown
+```markdown
 <include url="https://github.com/path/to/doc/raw/master/doc" nohead="true"></include>
 ```
 

diff --git a/changelog.md b/changelog.md
@@ -1,8 +1,11 @@
+# 1.1.16
+
+- Feat: added 'allow_failure' and 'stub_text` options
+
 # 1.1.15
 
 - Feat: recursive link processing for _url_ and _repo_url_
 
-
 # 1.1.14
 
 -   Fix `image_pattern` for `adjust_image_paths` method

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
     description=SHORT_DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     long_description_content_type='text/markdown',
-    version='1.1.15',
+    version='1.1.16',
     author='Konstantin Molchanov',
     author_email='[email protected]',
     url='https://github.com/foliant-docs/foliantcontrib.includes',

diff --git a/test/data/from_to/from_test_links.md b/test/data/from_to/from_test_links.md
@@ -1,6 +1,6 @@
 # Types of possible links
 
-[Using for test url](https://github.com/foliant-docs/foliantcontrib.includes/blob/update_includes/test/data/from_to/from_test_links.md)
+[Using for test url](https://github.com/foliant-docs/foliantcontrib.includes/blob/master/test/data/from_to/from_test_links.md)
 
 ## Changeable
 

diff --git a/test/data/from_to/to_test_links.md b/test/data/from_to/to_test_links.md
@@ -1,16 +1,16 @@
 # Types of possible links
 
-[Using for test url](https://github.com/foliant-docs/foliantcontrib.includes/blob/update_includes/test/data/from_to/from_test_links.md)
+[Using for test url](https://github.com/foliant-docs/foliantcontrib.includes/blob/master/test/data/from_to/from_test_links.md)
 
 ## Changeable
 
 ### Relative paths
 
-[`autodeploy.sh`](https://github.com/foliant-docs/foliantcontrib.includes/tree/update_includes/test/data/autodeploy.sh)
+[`autodeploy.sh`](https://github.com/foliant-docs/foliantcontrib.includes/tree/master/test/data/autodeploy.sh)
 
-[`jobs/*`](https://github.com/foliant-docs/foliantcontrib.includes/tree/update_includes/test/data/jobs/)
+[`jobs/*`](https://github.com/foliant-docs/foliantcontrib.includes/tree/master/test/data/jobs/)
 
-[`README.md`](https://github.com/foliant-docs/foliantcontrib.includes/tree/update_includes/test/data/README.md)
+[`README.md`](https://github.com/foliant-docs/foliantcontrib.includes/tree/master/test/data/README.md)
 
 ## Not changeable