mirror of
https://github.com/3b1b/manim.git
synced 2025-08-05 16:49:03 +00:00
1a8266b5a3
For reference: There had been a giant merge snafu (a merge on the Master branch of changes from Lighthouse2 that somehow overwrote many other files to older versions), apparently fixed on the Master branch by doing a reset to an older version and then a push -f. Before it was fixed, the merge snafu from Master was pulled into Sridhar's local WindingNumber, and then pushed to the remote WindingNumber as well. This was fixed by also doing a reset on Sridhar's local WindingNumber to the last good version and a push --force-with-lease. (There were some uncommitted changes on WindingNumber.py lost in the process, but luckily, by manually saving the file, those changes were reinserted, in this very commit). |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| basel.py | ||
| WindingNumber.py | ||