[Gambas-bugtracker] Bug #1503: gambas 3.12.1 has bad source files (merge failures?)

[bugtracker at gambaswiki.org]

http://gambaswiki.org/bugtracker/edit?object=BUG.1503&from=L21haW4-

Gianfranco COSTAMAGNA reported a new bug.

Summary
-------

gambas 3.12.1 has bad source files (merge failures?)

Type             : Bug
Priority         : Medium
Gambas version   : Unknown
Product          : Unknown


Description
-----------

e.g.:
comp/src/gb.map/.component
<<<<<<< HEAD
Version=3.12.90
=======
Version=3.12.0
>>>>>>> 0266ca1f15c1d0a0d6027725d8b113bf3781779a

comp/src/gb.map/.project
+<<<<<<< HEAD
+Version=3.12.90
+=======
+Version=3.12.0
+>>>>>>> 0266ca1f15c1d0a0d6027725d8b113bf3781779a


--- a/comp/src/gb.media.form/.src/FTest.form
+++ b/comp/src/gb.media.form/.src/FTest.form
@@ -6,5 +6,6 @@
   Margin = True
   { MediaView1 MediaView
     MoveScaled(4,5,38,30)
+    URL = "/home/benoit/Les Demoiselles de Rochefort (1967) - La Chanson de Maxence-atgHEhyJAnw.webm"
   }
 }

--- a/comp/src/gb.util.web/.src/MMain.module
+++ b/comp/src/gb.util.web/.src/MMain.module
@@ -13,7 +13,13 @@ Public Function GetNullObject() As Object
 End
 
 Public Sub Main()
+
+  Dim hURL As URL
+
+  hURL = URL.FromString("http://localhost/guygle/find?query=ordre+de+travail+avec+interventions+dont+la+date+planifiée+est+comprise+entre+le+01%2F03%2F2017+et+31%2F03%2F2017+et+type+est+Campagne+dont+agence+est+AG.CIG.GONESSE&format=json&test#f5")
+  
+  Print hURL.Query["query"]
   
-  Print URL.Decode("ordre+de+travail+avec+interventions+dont+la+date+planifi%C3%A9e+est+comprise+entre+le+01%2F03%2F2017+et+31%2F03%2F2017+et+type+est+Campagne+dont+agence+est+AG.CIG.GONESSE")
+  Print hURL.ToString()
 
 End

is that normal?


System information
------------------

none, I'm talking wrt the source tarball :)

anyway, this is preventing 3.12.1 being uploaded in debian...