Fix a merger

diff --git a/bindings/perl/Champlain/xs/ChamplainMapSource.xs b/bindings/perl/Champlain/xs/ChamplainMapSource.xs
index bdf15b4f41a35ff05052c091ab38acc2ff5541f2..395d8503a81a391e00bdd1bbe9489f9a17ac7a3d 100644 (file)
--- a/bindings/perl/Champlain/xs/ChamplainMapSource.xs
+++ b/bindings/perl/Champlain/xs/ChamplainMapSource.xs
@@ -58,7 +58,6 @@ champlain_map_source_set_license (ChamplainMapSource *map_source, const gchar *l
 
 const gchar*
 champlain_map_source_get_license (ChamplainMapSource *map_source)
-<<<<<<< HEAD:bindings/perl/Champlain/xs/ChamplainMapSource.xs
 
 
 void
@@ -67,5 +66,3 @@ champlain_map_source_set_projection (ChamplainMapSource *map_source, ChamplainMa
 
 ChamplainMapProjection
 champlain_map_source_get_projection (ChamplainMapSource *map_source)
-=======
->>>>>>> Remove the constructors as they don't exist any longer:bindings/perl/Champlain/xs/ChamplainMapSource.xs