Skip to content

Commit

Permalink
Fix merge error in conflicting merge
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrilpicat committed Jan 9, 2015
1 parent 10d31ac commit 43a0a17
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/shell/run-sonar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ if [ "$oclint" = "on" ]; then
includedCommandLineFlags=""
echo "$srcDirs" | sed -n 1'p' | tr ',' '\n' > tmpFileRunSonarSh
while read word; do
includedCommandLineFlags+=" --include '.*/${currentDirectory}/${word}.*'"
includedCommandLineFlags+=" --include '.*/${currentDirectory}/${word}'"
done < tmpFileRunSonarSh
rm -rf tmpFileRunSonarSh
if [ "$vflag" = "on" ]; then
Expand Down

0 comments on commit 43a0a17

Please sign in to comment.