Skip to content

Commit

Permalink
NIFI-13439 Resolving merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
timeabarna committed Jul 19, 2024
1 parent 40c98f1 commit fb30bcf
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
<configuration>
<!-- Enable parameters for AspectJ Around annotation argument name resolution -->
<parameters>true</parameters>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit fb30bcf

Please sign in to comment.