From 8c34300fea35289c103d73fc4eabf36a7c1fede2 Mon Sep 17 00:00:00 2001 From: Emmanuel Rodriguez Date: Tue, 5 May 2009 19:36:43 +0200 Subject: [PATCH] Fix a merger --- bindings/perl/Champlain/xs/ChamplainMapSource.xs | 3 --- 1 file changed, 3 deletions(-) diff --git a/bindings/perl/Champlain/xs/ChamplainMapSource.xs b/bindings/perl/Champlain/xs/ChamplainMapSource.xs index bdf15b4..395d850 100644 --- 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 -- 2.39.5