Commit ea04c93b authored by Mario's avatar Mario

resolve merge conflict


(cherry picked from commit 761fc74a)
parent 86929775
Pipeline #141706 canceled with stages
......@@ -45,7 +45,7 @@ if($argc == 2) {
break;
}
$x = q("SELECT DISTINCT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
$x = q("SELECT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
if($x) {
foreach($x as $xx) {
......@@ -88,7 +88,7 @@ if($argc == 2) {
break;
}
$x = q("SELECT DISTINCT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
$x = q("SELECT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
if($x) {
foreach($x as $xx) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment