Commit594c661

oleksandr.volha

committed

resolve conflicts

2 parents1ffa80c +68d3e0e commit594c661Copy full SHA for 594c661

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ field_mapping:`
`11`	`11`	`dns_query_name:xdm.network.dns.dns_question.name`
`12`	`12`	`QueryName:xdm.network.dns.dns_question.name`
`13`	`13`	`query:xdm.network.dns.dns_question.name`
`14`		`-dns-record-type:xdm.network.dns.dns_question.type`
	`14`	`+dns-record-type:xdm.network.dns.dns_question.type`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,4 @@ field_mapping:`
`75`	`75`	`EventSeverity:EventSeverity`
`76`	`76`	`Source:`
`77`	`77`	`-Source`
`78`		`- -source`
	`78`	`+ -source`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
	`53`	`+`
`53`	`54`	`classCortexXQLFieldValueRender(BaseFieldValueRender):`
`54`	`55`	`details:PlatformDetails=cortex_xql_query_details`
`55`	`56`	`str_value_manager=cortex_xql_str_value_manager`

Comments

(0)