Remove lines after merging

Author: vlad-perevezentsev

dpnp/tests/third_party/cupy/test_type_routines.py

@@ -47,10 +47,6 @@ def test_can_cast(self, xp, from_dtype, to_dtype):
         return ret
 
 
-<<<<<<< HEAD
-=======
-# @pytest.mark.skip("dpnp.common_type() is not implemented yet")
->>>>>>> e8871f0d797 (Second impl with dispatch_vector[only floating])
 class TestCommonType(unittest.TestCase):
 
     @testing.numpy_cupy_equal()