From ea04c93bfdf8c79adc33fc314ac8c7095a9ca8a7 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2019 19:52:29 +0000 Subject: resolve merge conflict (cherry picked from commit 761fc74a67e844db2421f5f7f039c8aa0731b5e6) --- util/storageconv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/storageconv b/util/storageconv index c4d981531..992c906b8 100755 --- a/util/storageconv +++ b/util/storageconv @@ -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) { -- cgit v1.2.3