diff --git a/pom.xml b/pom.xml index 58cf19777..4e5b131c5 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ null-object event-aggregator callback -<<<<<<< HEAD intercepting-filter +<<<<<<< HEAD ======= execute-around