Resolve text_env.rb conflict

spec/support/test_env.rb

@@ -46,13 +46,9 @@ module TestEnv
     'v1.1.0'                             => 'b83d6e3',
     'add-ipython-files'                  => '93ee732',
     'add-pdf-file'                       => 'e774ebd',
-<<<<<<< HEAD
     'squash-large-files'                 => '54cec52',
-    'add-pdf-text-binary'                => '79faa7b'
-=======
     'add-pdf-text-binary'                => '79faa7b',
     'add_images_and_changes'             => '010d106'
->>>>>>> ce-com/master
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily