merge problem
authorDave Raggett <dsr@w3.org>
Sun, 15 May 2011 10:31:14 +0100
changeset 17 fafb59c4e161
parent 16 797bd6494391
child 18 a31da9c89f9d
merge problem
sharing/query.php
--- a/sharing/query.php	Sun May 15 09:55:09 2011 +0100
+++ b/sharing/query.php	Sun May 15 10:31:14 2011 +0100
@@ -2,7 +2,6 @@
   require 'dbinfo.phi';
   require("config.php");
 
-
   $nl = "\n";
   $tab = "\t";
   $headers = apache_request_headers();