From 2388225c9b359ea79689f52cb2db8343e1d7d424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Benito=20Lamata?= Date: Sun, 7 May 2023 21:25:47 +0200 Subject: [PATCH] Solve issues with merging --- Source/ORTS.Common/ORTS.Common.csproj | 1 - Source/RunActivity/RunActivity.csproj | 2 -- 2 files changed, 3 deletions(-) diff --git a/Source/ORTS.Common/ORTS.Common.csproj b/Source/ORTS.Common/ORTS.Common.csproj index d95a1906b9..83a299e56b 100644 --- a/Source/ORTS.Common/ORTS.Common.csproj +++ b/Source/ORTS.Common/ORTS.Common.csproj @@ -26,7 +26,6 @@ all - diff --git a/Source/RunActivity/RunActivity.csproj b/Source/RunActivity/RunActivity.csproj index f1c25dcc46..ec2a90d36c 100644 --- a/Source/RunActivity/RunActivity.csproj +++ b/Source/RunActivity/RunActivity.csproj @@ -635,8 +635,6 @@ all - -