fix merge conflict 0.7.x 0.8.x in util.php and register.php.

2009-04-17 17:04:05 +00:00
parent 55d7bb4701 2eb1eb8683
commit e5094c3359
15 changed files with 448 additions and 523 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -1392,3 +1392,4 @@ function common_database_tablename($tablename)
  //table prefixes could be added here later
  return $tablename;
 }
+