From 11cf8c98dfcb049cd1caac3f1467ff1dfbaa4522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Thu, 5 Oct 2023 14:42:00 +0200
Subject: [PATCH] MAINT: correct urls and rename caosdb
---
README.md | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 120f158..b04f5f5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,11 @@
## Welcome
+<<<<<<< HEAD
This is a module for the [LinkAhead-Crawler](https://gitlab.com/linkahead/linkahead-crawler/)
+=======
+This is a module for the [LinkAhead Crawler](https://gitlab.com/linkahead/linkahead-crawler/)
+>>>>>>> ecd9c21 (MAINT: correct urls and rename caosdb)
that can read folder structures that comply with the
[BIDS specification](https://bids-specification.readthedocs.io).
@@ -42,20 +46,23 @@ does the following:
## Further Reading
-Please refer to the [official documentation](https://docs.indiscale.com/linkahead-crawler/) of the LinkAhead-Crawler for more information.
+Please refer to the [official documentation](https://docs.indiscale.com/caosdb-crawler/) of the LinkAhead Crawler for more information.
## Contributing
-Thank you very much to all contributers—[past, present](https://gitlab.com/linkahead/linkahead/-/blob/dev/HUMANS.md), and prospective ones.
+Thank you very much to all contributers—[past,
+present](https://gitlab.com/linkahead/linkahead/-/blob/main/HUMANS.md), and prospective
+ones.
### Code of Conduct
-By participating, you are expected to uphold our [Code of Conduct](https://gitlab.com/linkahead/linkahead/-/blob/dev/CODE_OF_CONDUCT.md).
+By participating, you are expected to uphold our [Code of
+Conduct](https://gitlab.com/linkahead/linkahead/-/blob/main/CODE_OF_CONDUCT.md).
### How to Contribute
* You found a bug, have a question, or want to request a feature? Please
-[create an issue](https://gitlab.com/linkahead/TODO-fill-url).
+[create an issue](https://gitlab.com/linkahead/crawler-extensions/bids-cfood/-/issues).
* You want to contribute code?
* **Forking:** Please fork the repository and create a merge request in GitLab and choose this repository as
target. Make sure to select "Allow commits from members who can merge the target branch" under
@@ -64,8 +71,7 @@ By participating, you are expected to uphold our [Code of Conduct](https://gitla
* **Code style:** This project adhers to the PEP8 recommendations, you can test your code style
using the `autopep8` tool (`autopep8 -i -r ./`). Please write your doc strings following the
[NumpyDoc](https://numpydoc.readthedocs.io/en/latest/format.html) conventions.
-* You can also contact us at **info (AT) caosdb.de** and join the
- LinkAhead community on
+* You can also join the LinkAhead community on
[#linkahead:matrix.org](https://matrix.to/#/!unwwlTfOznjEnMMXxf:matrix.org).
## License
--
GitLab