Skip to content

Commit

Permalink
update conflicts for network modifier
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 75ba319
Merge: ebb3957 ccc774f
Author: Slava Leleka <[email protected]>
Date:   Mon Aug 7 16:09:17 2023 +0300

    Merge branch 'master' into fix/network-compatibility-conflicts

commit ebb3957
Merge: 3459fa3 30ded45
Author: Slava Leleka <[email protected]>
Date:   Mon Aug 7 12:56:44 2023 +0300

    Merge branch 'master' into fix/network-compatibility-conflicts

commit 3459fa3
Author: Slava Leleka <[email protected]>
Date:   Mon Aug 7 11:40:19 2023 +0300

    update conflicts for network modifier
  • Loading branch information
slavaleleka committed Aug 7, 2023
1 parent ccc774f commit 43db0f5
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ adg_os_any:
docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#network-modifier
conflicts:
- app
- important
inverse_conflicts: true
negatable: false

0 comments on commit 43db0f5

Please sign in to comment.