Commit 761fc74a authored by Mario's avatar Mario

resolve merge conflict

parents 0e2239e5 e9a17517
Pipeline #141697 passed with stage
in 4 minutes and 34 seconds
......@@ -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