Skip to content
Snippets Groups Projects
Commit e72c2e24 authored by vlorentz's avatar vlorentz
Browse files

fix merge

parent 69b5c737
No related branches found
No related tags found
1 merge request!1055postgresql: Avoid deadlocks by ordering rows before insertion
Pipeline #5001 failed
Stage: external
Hide whitespace changes
Inline Side-by-side
swh/storage/sql/40-funcs.sql
+ 0
− 1
View file @ e72c2e24
......@@ -234,7 +234,6 @@ begin
on conflict
do nothing
;
>>>>>>> swh/storage/sql/40-funcs.sql
', typ);
execute format('
......
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