Commit b815dc9b authored by Sam Rose's avatar Sam Rose

Resolve test_env.rb conflicts

parent 0bde54c3
...@@ -41,11 +41,8 @@ module TestEnv ...@@ -41,11 +41,8 @@ module TestEnv
'csv' => '3dd0896', 'csv' => '3dd0896',
'v1.1.0' => 'b83d6e3', 'v1.1.0' => 'b83d6e3',
'add-ipython-files' => '6d85bb69', 'add-ipython-files' => '6d85bb69',
<<<<<<< HEAD 'add-pdf-file' => 'e774ebd3',
'squash-large-files' => '54cec52', 'squash-large-files' => '54cec52',
=======
'add-pdf-file' => 'e774ebd3'
>>>>>>> ce-com/master
}.freeze }.freeze
# gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
......
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