Skip to content

Commit

Permalink
Merge branch 'pr-80' into pmd/5.4.x
Browse files Browse the repository at this point in the history
Closes #80 (rebased)
  • Loading branch information
adangel committed Jan 7, 2016
2 parents 38e1ff9 + d783bdc commit f186d25
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/site/markdown/overview/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
**Pull Requests:**

* [#79](https://github.com/pmd/pmd/pull/79): do not flag public static void main(String[]) as UseVarargs; ignore @Override for UseVarargs
* [#80](https://github.com/pmd/pmd/pull/80): Update mvn-plugin.md

**Bugfixes:**

Expand Down
2 changes: 1 addition & 1 deletion src/site/markdown/usage/mvn-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ the report to html source files, and the file encoding:
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<linkXref>true</linkXref>
<linkXRef>true</linkXRef>
<sourceEncoding>ISO-8859-1</sourceEncoding>
<minimumTokens>30</minimumTokens>
<targetJdk>1.4</targetJdk>
Expand Down

0 comments on commit f186d25

Please sign in to comment.