Open simondharding opened 1 year ago
Thanks Simon - just needs the >>>> etc text removed in 3 of the files. i.e:
>>>>
<<<<<<< HEAD release = '2.1.4' ======= release = '2.1.5' >>>>>>> 548f9a8 (fixes for https and version to 2.1.5 by simon)
should be
release = '2.1.5'
Thanks Simon - just needs the
>>>>
etc text removed in 3 of the files. i.e:should be