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

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 88876554824d83b74250acfae3ea82c57ffcae27..da009682bbc865e6eaf1431b292b29160f4a49c9 100644 (file)
--- 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;
 }
+