Fixed mistakenly merge conflict commit

DataDog · Jan 17, 2024 · b08c07a · b08c07a
1 parent 490b79e
commit b08c07a
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/tracer/missing-nullability-files.csv b/tracer/missing-nullability-files.csv
@@ -169,9 +169,9 @@ src/Datadog.Trace/HttpOverStreams/HttpMessage.cs
 src/Datadog.Trace/HttpOverStreams/HttpRequest.cs
 src/Datadog.Trace/HttpOverStreams/HttpResponse.cs
 src/Datadog.Trace/HttpOverStreams/IHttpContent.cs
-src/Datadog.Trace/IAST/Iast.cs
-src/Datadog.Trace/IAST/ITaintedMap.cs
-src/Datadog.Trace/IAST/SourceType.cs
+src/Datadog.Trace/Iast/Iast.cs
+src/Datadog.Trace/Iast/ITaintedMap.cs
+src/Datadog.Trace/Iast/SourceType.cs
 src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs
 src/Datadog.Trace/PlatformHelpers/AzureContext.cs
 src/Datadog.Trace/PlatformHelpers/ContainerMetadata.cs
@@ -426,10 +426,10 @@ src/Datadog.Trace/Headers/Ip/IpInfo.cs
 src/Datadog.Trace/Headers/Ip/RequestIpExtractor.cs
 src/Datadog.Trace/HttpOverStreams/HttpContent/BufferContent.cs
 src/Datadog.Trace/HttpOverStreams/HttpContent/StreamContent.cs
-src/Datadog.Trace/IAST/Analyzers/UserStringInterop.cs
-src/Datadog.Trace/IAST/Aspects/DebugAspects.cs
-src/Datadog.Trace/IAST/Dataflow/AspectFilter.cs
-src/Datadog.Trace/IAST/Dataflow/AspectType.cs
+src/Datadog.Trace/Iast/Analyzers/UserStringInterop.cs
+src/Datadog.Trace/Iast/Aspects/DebugAspects.cs
+src/Datadog.Trace/Iast/Dataflow/AspectFilter.cs
+src/Datadog.Trace/Iast/Dataflow/AspectType.cs
 src/Datadog.Trace/PDBs/dnlibAdditions/DssSymbolReaderImpl.Additions.cs
 src/Datadog.Trace/PDBs/dnlibAdditions/PdbReader.Additions.cs
 src/Datadog.Trace/PDBs/dnlibAdditions/PortablePdbReader.Additions.cs
@@ -672,10 +672,10 @@ src/Datadog.Trace/Debugger/Sink/Models/ProbeException.cs
 src/Datadog.Trace/Debugger/Sink/Models/ProbeStatus.cs
 src/Datadog.Trace/Debugger/Sink/Models/Status.cs
 src/Datadog.Trace/Debugger/Sink/Models/TimedMessage.cs
-src/Datadog.Trace/IAST/Aspects/System.DirectoryServices/SearchRequestAspect.cs
-src/Datadog.Trace/IAST/Aspects/System.Web.SessionState/HttpSessionStateBaseAspect.cs
-src/Datadog.Trace/IAST/Aspects/System.Web.SessionState/SessionExtensionsAspect.cs
-src/Datadog.Trace/IAST/Aspects/System/StringAspects.cs
+src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/SearchRequestAspect.cs
+src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/HttpSessionStateBaseAspect.cs
+src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/SessionExtensionsAspect.cs
+src/Datadog.Trace/Iast/Aspects/System/StringAspects.cs
 src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Signed.cs
 src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/Target.cs
 src/Datadog.Trace/RemoteConfigurationManagement/Protocol/Tuf/TargetCustom.cs