Commit b2ec0bf8 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Fix bad conflict resolution

parent 5775bc76
......@@ -1678,8 +1678,6 @@ describe Project, models: true do
project.add_import_job
expect(project.reload.import_status).to eq('finished')
=======
>>>>>>> 9-1-stable
end
end
......
Markdown is supported
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