diff --git a/ChangeLog b/ChangeLog
index 81b6a66c1..2bdc98329 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-02-25 Garvin Hicking <me@supergarv.de>
+    * tbl_properties.inc.php3: Fixed duped display of comments due to
+      merging diff conflict.
+
 2003-02-24 Alexander M. Turek  <rabus@users.sourceforge.net>
     * common.lib.php3: Backwards compatibility.
 
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3
index 2f6448be3..ee4f54019 100755
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php3
@@ -43,13 +43,6 @@ require('./libraries/relation.lib.php3');
 require('./libraries/transformations.lib.php3');
 $cfgRelation = PMA_getRelationsParam();
 
-$comments_map = array();
-
-if ($cfgRelation['commwork']) {
-    $comments_map = PMA_getComments($db, $table);
-    echo '<th>' . $strComments . '</th>';
-}
-
 $comments_map = array();
 $mime_map = array();
 $available_mime = array();