remove conflicts

Fork: 0

tanyue / xxl-job-dm

Browse code remove conflicts master
1 parent 11ac41a commit 7a31abc6c8e779ae3d6809d883222fdfc10edda9 thinking_fioa authored on 12 Dec 2017

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View xxl-job-admin/src/main/resources/xxl-job-admin.properties

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties

Show line notes below