fix conflits + update requirements

dtsprm · dtsprm · commit 342f8dbcff0b · 2024-08-01T11:43:03.000+02:00
diff --git a/uncoder-core/app/translator/mappings/platforms/qradar/default.yml b/uncoder-core/app/translator/mappings/platforms/qradar/default.yml
@@ -39,11 +39,7 @@ field_mapping:
     - Username
     - Security ID
   CommandLine: Command
-<<<<<<< HEAD
-  Protocol:
-=======
   Protocol: 
->>>>>>> main
     - IPProtocol
     - protocol
   Application:
diff --git a/uncoder-core/app/translator/mappings/platforms/qradar/webserver.yml b/uncoder-core/app/translator/mappings/platforms/qradar/webserver.yml
@@ -13,11 +13,7 @@ field_mapping:
     - URL
     - XForceCategoryByURL
   c-useragent: User Agent
-<<<<<<< HEAD
-  cs-method:
-=======
   cs-method: 
->>>>>>> main
     - HTTP Method
     - Method
   cs-bytes: Bytes Sent
diff --git a/uncoder-core/requirements.txt b/uncoder-core/requirements.txt
@@ -6,3 +6,4 @@ colorama~=0.4.6
 ruff==0.1.13
 ujson==5.9.0
 xmltodict~=0.13.0
+isodate==0.6.1
