.gitignore
-u
Merge branch 'master' of https://github.com/wuwj-cn/ngsql-parser.git

Conflicts:
	target/classes/org/ng12306/ngsql/parser/App.class
	target/test-classes/org/ng12306/ngsql/parser/AppTest.class