Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
--- a/pmd_display_field.php
+++ b/pmd_display_field.php
@@ -8,7 +8,6 @@
 *
 */
 include_once 'pmd_common.php';
-require_once './libraries/relation.lib.php';


 $table = $T;