Resolve test_env.rb conflicts

spec/support/test_env.rb

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