Fixing issue of rebase

Author: jvidalor

src/ansys/dpf/gate/generated/property_field_abstract_api.py

@@ -47,10 +47,6 @@ def csproperty_field_new(numEntities, data_size):
 	def csproperty_field_new_location(numEntities, data_size, location):
 		raise NotImplementedError
 
-<<<<<<< HEAD
-=======
-	@staticmethod
->>>>>>> 9e1687ce7 (update generated code)
 	def csproperty_field_new_with_transformation(numEntities, data_size, wf, input_name, output_name):
 		raise NotImplementedError