JENKINS-20147: Add include and exclude files patterns

Add include patterns option to include files in the report based on their absolute paths. Add exclude patterns option to exclude files from the report based on their absolute paths. Issue: JENKINS-20147 Change-Id: I2220dc9b613bd95d4fbd1b0bd102f578c359e862
jenkinsci · Nov 11, 2013 · b2c66d7 · b2c66d7
1 parent 175b66d
commit b2c66d7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/plugin/src/main/resources/hudson/plugins/findbugs/FindBugsReporter/config.jelly b/plugin/src/main/resources/hudson/plugins/findbugs/FindBugsReporter/config.jelly
@@ -4,10 +4,6 @@
   <fb:rank/>
   <f:advanced>
     <fb:filter/>
-<<<<<<< HEAD
     <u:advancedMaven id="findbugs"/>
-=======
-    <u:advanced id="findbugs" />
->>>>>>> branch 'master' of https://github.com/ger007s/findbugs-plugin.git
   </f:advanced>
 </j:jelly>