conflict on web/index
Merge branch 'release/4.6.7' into develop
No related branches found
No related tags found
Showing
- about.pl 1 addition, 1 deletionabout.pl
- binder/Dockerfile 1 addition, 1 deletionbinder/Dockerfile
- biocham_jupyter/guinbextension/package.json 1 addition, 1 deletionbiocham_jupyter/guinbextension/package.json
- biocham_jupyter/kernel/biocham_kernel/__init__.py 1 addition, 1 deletionbiocham_jupyter/kernel/biocham_kernel/__init__.py
- web/index.html 1 addition, 1 deletionweb/index.html
Please register or sign in to comment