From 3ab2e34fda50d2a4ff972a1916c844e052b19518 Mon Sep 17 00:00:00 2001 From: Emmanuel Rodriguez Date: Sun, 3 May 2009 21:39:08 +0200 Subject: [PATCH] Remove the constructors as they don't exist any longer --- bindings/perl/Champlain/xs/ChamplainMapSource.xs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bindings/perl/Champlain/xs/ChamplainMapSource.xs b/bindings/perl/Champlain/xs/ChamplainMapSource.xs index 395d850..bdf15b4 100644 --- a/bindings/perl/Champlain/xs/ChamplainMapSource.xs +++ b/bindings/perl/Champlain/xs/ChamplainMapSource.xs @@ -58,6 +58,7 @@ 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 @@ -66,3 +67,5 @@ 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 -- 2.39.5