Merge branch 'master' into 'master'

修正jeremylong See merge request !234

Merge branch 'master' into 'master'
修正jeremylong See merge request !234
0544f3e6 · XianxinMao · 5dd3f5b0 · 71710ef9 · 0544f3e6
隐藏空白更改
内联并排

Showing with 0 addition and 16 deletion

projects/jeremylong/imports.yml projects/jeremylong/imports.yml +0 -16

未找到文件。
--- a/projects/jeremylong/imports.yml
+++ b/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