diff options
| author | Mario <mario@mariovavti.com> | 2019-06-10 19:52:29 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-10 22:35:30 +0200 |
| commit | ea04c93bfdf8c79adc33fc314ac8c7095a9ca8a7 (patch) | |
| tree | 962a6f8de543ad1ff662464ecb1f1a2be85d07d4 | |
| parent | 86929775852897d5282b334161e489050f1c55ae (diff) | |
| download | volse-hubzilla-ea04c93bfdf8c79adc33fc314ac8c7095a9ca8a7.tar.gz volse-hubzilla-ea04c93bfdf8c79adc33fc314ac8c7095a9ca8a7.tar.bz2 volse-hubzilla-ea04c93bfdf8c79adc33fc314ac8c7095a9ca8a7.zip | |
resolve merge conflict
(cherry picked from commit 761fc74a67e844db2421f5f7f039c8aa0731b5e6)
| -rwxr-xr-x | util/storageconv | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |