chore: remove conflict marker

This commit is contained in:
Youwen Wu 2025-04-03 23:50:41 -07:00
parent fac391ce18
commit 75111623be
Signed by: youwen
GPG key ID: 865658ED1FE61EC3

View file

@ -18,9 +18,9 @@ transpiles
Gradescope Gradescope
bijections bijections
disjunction disjunction
<<<<<<< HEAD
denumerable denumerable
Multinomial Multinomial
biconditional biconditional
hyperextensible hyperextensible
diagonalization diagonalization
parametrization