merge conflict moment

This commit is contained in:
Xander Mckay 2024-11-26 15:40:07 -05:00
commit 72b7f87dd7
9 changed files with 300 additions and 1 deletions

View file

@ -38,4 +38,7 @@ very bad code that is
commented out for a very
good reason
*/
a++ /* something */ # something
a++ /* something */ # something
dtwice = compose(d,d)
print(dtwice(2))