fix conflict

Signed-off-by: Miles Zhang <[email protected]>
nervosnetwork · Dec 13, 2024 · 7e63555 · 7e63555
1 parent 414cc8c
commit 7e63555
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lib/tasks/migration/analyze_contract_from_start_block.rake b/lib/tasks/migration/analyze_contract_from_start_block.rake
@@ -87,10 +87,6 @@ namespace :migration do
                   {
                     type_hash: cell_output.type_script&.script_hash,
                     data_hash: cell_output.data_hash,
-<<<<<<< HEAD
-=======
-
->>>>>>> issue-794-7
                     deployed_cell_output_id: cell_output.id,
                     deployed_args: cell_output.type_script&.args,
                   }