remove merge flags

natmchugh · natmchugh · commit be482c431f09 · 2013-10-24T17:36:34.000+01:00
diff --git a/php_geospatial.h b/php_geospatial.h
@@ -133,11 +133,9 @@ PHP_FUNCTION(cartesian_to_polar);
 PHP_FUNCTION(transform_datum);
 PHP_FUNCTION(dms_to_decimal);
 PHP_FUNCTION(decimal_to_dms);
-<<<<<<< HEAD
 PHP_FUNCTION(vincenty);
-=======
 PHP_FUNCTION(rdp_simplify);
->>>>>>> 53918a081d6392588cd4dae701af9b6f4ea78527
+
 
 #endif	/* PHP_GEOSPATIAL_H */
 
