resolve test_env conflicts

[ci skip]

spec/support/test_env.rb

@@ -41,14 +41,9 @@ module TestEnv
     'wip'                                => 'b9238ee',
     'csv'                                => '3dd0896',
     'v1.1.0'                             => 'b83d6e3',
-<<<<<<< HEAD
-    'add-ipython-files'                  => '6d85bb6',
+    'add-ipython-files'                  => '93ee732',
     'add-pdf-file'                       => 'e774ebd',
     'squash-large-files'                 => '54cec52'
-=======
-    'add-ipython-files'                  => '93ee732',
-    'add-pdf-file'                       => 'e774ebd'
->>>>>>> upstream/master
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily