Merge branch 'master' into 'master'

修正jeremylong

See merge request codechina/mirrors-settings!234

projects/jeremylong/imports.yml

-<<<<<<< HEAD
 ---
 group:
   name: 'jeremylong'
   description: ''
   projects:
-  - name: 'DependencyCheck'
-    description: ''
-    mirrorRelease: false
-    topic: '' 
-=======
----
-group:
-  name: 'jeremylong'
-  description: ''
-  projects:
-  - name: 'DependencyCheck'
-    description: ''
-    mirrorRelease: false
-    topic: ''
   - name: 'DependencyCheck'
     description: ''
     mirrorRelease: false
     topic: ''
->>>>>>> master
   
\ No newline at end of file