Skip to content

Commit 7f69b3a

Browse files
committed
fix conflicts
1 parent c10b89d commit 7f69b3a

File tree

1 file changed

+0
-8
lines changed
  • uncoder-core/app/translator/mappings/platforms/qradar

1 file changed

+0
-8
lines changed

uncoder-core/app/translator/mappings/platforms/qradar/default.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ field_mapping:
1414
- DstPort
1515
- DestinationPort
1616
- remoteport
17-
<<<<<<< HEAD
18-
dst-hostname: DstHost
19-
src-hostname: SrcHost
20-
=======
21-
>>>>>>> main
2217
src-port:
2318
- SourcePort
2419
- localport
@@ -36,10 +31,7 @@ field_mapping:
3631
- destinationIP
3732
- destinationaddress
3833
- destination
39-
<<<<<<< HEAD
40-
=======
4134
- DstHost
42-
>>>>>>> main
4335
User:
4436
- userName
4537
- EventUserName

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy