Merge branch 'master' into open-source - Githubissues

PositiveTechnologies / AspxParser

Aspx files (aspx, ascx, etc.) parser.

MIT License

9 stars 8 forks source link

Merge branch 'master' into open-source #2

Closed KvanTTT closed 7 years ago

KvanTTT commented 7 years ago

Conflicts:

AspxParser/ParserImpl/Parser.Parse.cs
AspxParser/ParserImpl/Parser.ProcessBeginTag.cs
AspxParser/ParserImpl/Parser.ProcessEndTag.cs