search

helloflask / bootstrap-flask

Bootstrap 4 & 5 helper for your Flask projects.
https://bootstrap-flask.readthedocs.io
Other
1.12k stars 190 forks source link

icons overview for testing and doc for offline development #199

Closed PanderMusubi closed 2 years ago

greyli commented 2 years ago

Not sure how you did this, but you included some commits from the master branch and edited them. If you want to sync the current branch with the master branch, you can do:

git fetch upstream
git rebase upstream/master
PanderMusubi commented 2 years ago

Can you see if it is fixed now? Thanks

greyli commented 2 years ago

Can you see if it is fixed now? Thanks

Nope, more commits are copied to this branch. You can create a new branch, then cherry-pick the correct commits to the new branch.

PanderMusubi commented 2 years ago

Please see https://github.com/helloflask/bootstrap-flask/pull/236 (sorry I forked in the organization's account, was meant in my personal account. After merge, I will delete it.)