fix: comment out the merge sign in errata.tex

enklht · enklht · commit 3e60a8ebccda · 2025-06-27T08:25:57.000+12:00
diff --git a/errata.tex b/errata.tex
@@ -480,11 +480,11 @@
   & The text should be ``Show that for any $A,B:\UU$, the following type is equivalent to $\eqv A B$.  Can you extract from this a definition of a type satisfying the three desiderata of $\isequiv(f)$?''\\
   %
   \cref{thm:object-classifier}
-  & merge of 367864df
+  & % merge of 367864df
   & To maintain consistency, one line was added at the end of the computation of the composite equivalence in the proof.
   %
   \cref{thm:fiber-of-a-fibration}
-  & merge of edb908a2
+  & % merge of edb908a2
   & The type of $\proj{1}$ should be $(\sm{x:A}P(x))\to A$.
   %
   % Chapter 5

Original file line number	Diff line number	Diff line change
`@@ -480,11 +480,11 @@`
`480`	`480`	& The text should be ``Show that for any $A,B:\UU$, the following type is equivalent to $\eqv A B$. Can you extract from this a definition of a type satisfying the three desiderata of $\isequiv(f)$?''\\
`481`	`481`	`%`
`482`	`482`	`\cref{thm:object-classifier}`
`483`		`- & merge of 367864df`
	`483`	`+ & % merge of 367864df`
`484`	`484`	`& To maintain consistency, one line was added at the end of the computation of the composite equivalence in the proof.`
`485`	`485`	`%`
`486`	`486`	`\cref{thm:fiber-of-a-fibration}`
`487`		`- & merge of edb908a2`
	`487`	`+ & % merge of edb908a2`
`488`	`488`	`& The type of $\proj{1}$ should be $(\sm{x:A}P(x))\to A$.`
`489`	`489`	`%`
`490`	`490`	`% Chapter 5`