From: Emmanuel Rodriguez <emmanuel.rodriguez@gmail.com>
Date: Tue, 5 May 2009 17:36:43 +0000 (+0200)
Subject: Fix a merger
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c34300fea35289c103d73fc4eabf36a7c1fede2;p=libchamplain

Fix a merger
---

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