Skip to content

Commit

Permalink
Revert "Fix merge error."
Browse files Browse the repository at this point in the history
This reverts commit fee75ff.
  • Loading branch information
claudiamurialdo committed Jan 7, 2025
1 parent fee75ff commit 0127bd6
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace GeneXus.Utils
using System.Runtime.Serialization;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Text.Json.Serialization;

Check failure on line 22 in dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

View workflow job for this annotation

GitHub Actions / test-external-storages

The using directive for 'System.Text.Json.Serialization' appeared previously in this namespace

Check failure on line 22 in dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

View workflow job for this annotation

GitHub Actions / test-external-storages

The using directive for 'System.Text.Json.Serialization' appeared previously in this namespace

Check failure on line 22 in dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'System.Text.Json.Serialization' appeared previously in this namespace

Check failure on line 22 in dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'System.Text.Json.Serialization' appeared previously in this namespace

Check failure on line 22 in dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

The using directive for 'System.Text.Json.Serialization' appeared previously in this namespace

Check failure on line 22 in dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

The using directive for 'System.Text.Json.Serialization' appeared previously in this namespace
using System.Xml;
using System.Xml.Serialization;
using GeneXus.Application;
Expand Down

0 comments on commit 0127bd6

Please sign in to comment.