[Resolved conflict
John Goerzen <jgoerzen@complete.org>**20070921233428] {
hunk ./en/ch06-typeclasses.xml 24
-    <example id="hs.typeclasses.ex.naiveeq">
-      <title>Naive Equality -- Colors (naiveeq.hs)</title>
-      &naiveeq.hs:color;
-    </example>
+    &naiveeq.hs:color;
hunk ./en/ch06-typeclasses.xml 199
-    <remark>FIXME: How to cite sources on this? -- jg</remark>
-    <example id="hs.typeclasses.ex.eq">
-      <title>Haskell Standard Eq Typeclass</title>
-      <programlisting>
+    <programlisting>
hunk ./en/ch06-typeclasses.xml 207
-     </programlisting>
+   </programlisting>
}