diff options
| author | Mario <mario@mariovavti.com> | 2019-06-10 21:52:29 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-10 21:52:29 +0200 |
| commit | 761fc74a67e844db2421f5f7f039c8aa0731b5e6 (patch) | |
| tree | 584337b0bc55fc6d9d726d06182608899f22bc03 | |
| parent | 0e2239e50b6a4da8261a03284211d989c87f50e2 (diff) | |
| parent | e9a17517d3c57e3f97e5c4180bf26208898f4afc (diff) | |
| download | volse-hubzilla-761fc74a67e844db2421f5f7f039c8aa0731b5e6.tar.gz volse-hubzilla-761fc74a67e844db2421f5f7f039c8aa0731b5e6.tar.bz2 volse-hubzilla-761fc74a67e844db2421f5f7f039c8aa0731b5e6.zip | |
resolve merge conflict
| -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) { |