Fix merge

This commit is contained in:
Andreas Dangel
2020-08-21 11:55:13 +02:00
parent ab489832fe
commit b9829c78fb

View File

@ -102,7 +102,7 @@
token="throw new Error(t.getMessage())" token="throw new Error(t.getMessage())"
value="throw t" /> value="throw t" />
<!-- Set tab size of JavaCC to 1 --> <!-- Set tab size of JavaCC to 1 -->
<replace file="${target}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java" <replace file="${tmp-package.dir}/${cs.prefix}CharStream.java"
token="int tabSize = 8;" token="int tabSize = 8;"
value="int tabSize = 1;" /> value="int tabSize = 1;" />