osl-incubator / scicookie

Cookiecutter template for a Python package.

https://osl-incubator.github.io/scicookie

Other

11 stars 18 forks source link

Closed Satarupa22-SD closed 3 months ago

Satarupa22-SD commented 3 months ago

240

@xmnlab

xmnlab commented 3 months ago

hey @Satarupa22-SD it seems you were working on a previous branch as you can see you have a conflict file

please rebase your branch on top of the upstream/main