From 0d9489f617b05752f47c3bb6727219e908b3ed9e Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Sun, 19 Jan 2020 13:26:11 +0000
Subject: [PATCH] --- Merging r43915 into '.': C    packages/fcl-xml/fpmake.pp
 C    packages/fpmkunit/fpmake.pp --- Recording mergeinfo for merge of r43915
 into '.':  U   . Summary of conflicts:   Text conflicts: 2 Summary of
 conflicts:   Text conflicts: 2

git-svn-id: branches/fixes_3_2@43980 -
---
 packages/fcl-xml/fpmake.pp  | 1 -
 packages/fpmkunit/fpmake.pp | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp
index 64b8ef0b42..1b1d40c1b3 100644
--- a/packages/fcl-xml/fpmake.pp
+++ b/packages/fcl-xml/fpmake.pp
@@ -21,7 +21,6 @@ begin
     P.Version:='3.2.0-beta';
     P.Options.Add('-S2h');
     D:=P.Dependencies.Add('fcl-base');
-      D.Version:='3.2.0-beta';
     D:=P.Dependencies.Add('iconvenc',[linux,darwin,iphonesim,freebsd,haiku,beos,aix]);
 
     P.Author := 'Sebastian Guenther, Sergei Gorelkin and FPC development team';
diff --git a/packages/fpmkunit/fpmake.pp b/packages/fpmkunit/fpmake.pp
index 9c15c2da7d..bfcab15241 100644
--- a/packages/fpmkunit/fpmake.pp
+++ b/packages/fpmkunit/fpmake.pp
@@ -33,13 +33,9 @@ begin
     // here to be able to update all requirements to
     // compile fpmake from a single place
     D:=P.Dependencies.Add('hash');
-      D.Version:='3.2.0-beta';
     D:=P.Dependencies.Add('paszlib');
-      D.Version:='3.2.0-beta';
     D:=P.Dependencies.Add('fcl-process',AllOSes-[morphos,aros,amiga,go32v2,os2]);
-      D.Version:='3.2.0-beta';
     D:=P.Dependencies.Add('libtar');
-      D.Version:='3.2.0-beta';
 
     with P.Targets.AddUnit('src/fpmkunit.pp') do
       ResourceStrings:=true;