fix conflicts

cowprotocol · Sep 6, 2024 · a2a2c6b · a2a2c6b
1 parent 1236347
commit a2a2c6b
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/...base/sql/V069__executed_protocol_fees.sql → ...base/sql/V070__executed_protocol_fees.sql b/...base/sql/V069__executed_protocol_fees.sql → ...base/sql/V070__executed_protocol_fees.sql