julmis' last commit contained garbage from a CVS merge conflict he obviously had,

so I 'm removing them. Good thing they weren't mixed with deliberate changes!

diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index a2c1789787098452aec9cb237b40a0c41e6632b8..35217c46726485258e02c5b3ade3f0a4b1640908 100644 (file)
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -86,11 +86,7 @@
     </font>
     </td>
     <td>
-<<<<<<< mod.html
-        <!-- <textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea> -->
-=======
         <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
->>>>>>> 1.33
     </td>
 </tr>