Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merger from Head Master #1

Merged
merged 3 commits into from
Sep 15, 2016
Merged

Merger from Head Master #1

merged 3 commits into from
Sep 15, 2016

Conversation

msp1kpj
Copy link
Owner

@msp1kpj msp1kpj commented Sep 15, 2016

Pull project changes into local development

tstec and others added 3 commits July 25, 2016 09:13
In some situations CFMLParser mixes content of analyzed files. That's why we need to create separate instance of CFMLParser for each file.
# Conflicts:
#	src/main/java/com/cflint/CFLint.java
@msp1kpj msp1kpj merged commit b4391d6 into msp1kpj:master Sep 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants