Skip to content

Commit

Permalink
Fix conflicts to main (#1269)
Browse files Browse the repository at this point in the history
fix conflicts to main
  • Loading branch information
karan-batavia authored Sep 5, 2024
1 parent 083acfc commit dcf1bbf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Privado Core

Branch structure


main - This branch will contain the released version of the code.

dev - This branch will be used to merge all under-development features.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ trait DynamicRuleMerger {
val externalOtherRule = new ListBuffer[RuleInfo]

val internalRuleMap = mutable.Map(
internalSinkRules
.filter(rule => rule.domains.nonEmpty && rule.name.nonEmpty)
.map(rule => ((rule.domains.headOption.get, rule.name, rule.filterProperty), rule)): _*
internalSinkRules.map(rule => ((rule.domains.headOption.get, rule.name, rule.filterProperty), rule))*
)

externalSinkRules.foreach { externalRule =>
Expand Down

0 comments on commit dcf1bbf

Please sign in to comment.