Merge branch 'master' of git.oschina.net:flashsword20/webmagic

Browse Source

Conflicts:
	webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java

pull/358/head

yihua.huang 11 years ago

parent 98e2bba099 1bdffc1e56

commit 4f68368db0

1 changed files with 93 additions and 93 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save