Merge pull request HoTT#1180 from enklht/typos

fix: Comment out merge sign in errata.tex

Author: mikeshulman

errata.tex

@@ -411,7 +411,7 @@
   %
   \cref{subsec:logic-hprop}
   & 37-g0bd66c8
-  & In the discussion for $\Sigma$-types in the last paragraph, $A$ is an arbitrary type.
+  & In the discussion for $\Sigma$-types in the last paragraph, $A$ is an arbitrary type.\\
   %
   \cref{thm:retract-contr}
   & 95-gce0131f
@@ -480,12 +480,12 @@
   & 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
-  & To maintain consistency, one line was added at the end of the computation of the composite equivalence in the proof.
+  & % 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
-  & The type of $\proj{1}$ should be $(\sm{x:A}P(x))\to A$.
+  & % merge of edb908a2
+  & The type of $\proj{1}$ should be $(\sm{x:A}P(x))\to A$.\\
   %
   % Chapter 5
   %