Skip to content

Commit baa9b8f

Browse files
committed
fix: fix conflict
2 parents 5972256 + c225528 commit baa9b8f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

β€ŽREADME.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
223223
<td align="center"><a href="https://github.com/xiaogonggong-w"><img src="https://avatars.githubusercontent.com/u/79799040?v=4" width="100px;" alt=""/><br /><sub><b>xiaogonggong-w</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=xiaogonggong-w" title="Code">πŸ’»</a></td>
224224
<td align="center"><a href="https://github.com/hqchqc"><img src="https://avatars.githubusercontent.com/u/51051157?v=4" width="100px;" alt=""/><br /><sub><b>hqchqc</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=hqchqc" title="Code">πŸ’»</a></td>
225225
<td align="center"><a href="https://github.com/Lucky-Ya-Q"><img src="https://avatars.githubusercontent.com/u/63504321?v=4" width="100px;" alt=""/><br /><sub><b>Lucky-Ya-Q</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=Lucky-Ya-Q" title="Code">πŸ’»</a></td>
226-
<td align="center"><a href="https://github.com/xGuangsPBD"><img src="https://avatars.githubusercontent.com/u/41880611?v=4" width="100px;" alt=""/><br /><sub><b>xGuangsPBD</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=xGuangsPBD" title="Code">πŸ’»</a></td>
227-
<td align="center"><a href="https://github.com/cnvoid"><img src="https://avatars.githubusercontent.com/u/17289381?v=4" width="100px;" alt=""/><br /><sub><b>cnvoid</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=cnvoid" title="Code">πŸ’»</a></td>
228226
</tr>
229227
<tr>
228+
<td align="center"><a href="https://github.com/xGuangsPBD"><img src="https://avatars.githubusercontent.com/u/41880611?v=4" width="100px;" alt=""/><br /><sub><b>xGuangsPBD</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=xGuangsPBD" title="Code">πŸ’»</a></td>
229+
<td align="center"><a href="https://github.com/cnvoid"><img src="https://avatars.githubusercontent.com/u/17289381?v=4" width="100px;" alt=""/><br /><sub><b>cnvoid</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=cnvoid" title="Code">πŸ’»</a></td>
230230
<td align="center"><a href="https://github.com/sakanaovo"><img src="https://avatars.githubusercontent.com/u/86860377?v=4" width="100px;" alt=""/><br /><sub><b>sakanaovo</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=sakanaovo" title="Code">πŸ’»</a></td>
231231
</tr>
232232
</tbody>

β€ŽREADME.zh-CN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ pnpm scripts
213213
<td align="center"><a href="https://github.com/xiaogonggong-w"><img src="https://avatars.githubusercontent.com/u/79799040?v=4" width="100px;" alt=""/><br /><sub><b>xiaogonggong-w</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=xiaogonggong-w" title="Code">πŸ’»</a></td>
214214
<td align="center"><a href="https://github.com/hqchqc"><img src="https://avatars.githubusercontent.com/u/51051157?v=4" width="100px;" alt=""/><br /><sub><b>hqchqc</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=hqchqc" title="Code">πŸ’»</a></td>
215215
<td align="center"><a href="https://github.com/Lucky-Ya-Q"><img src="https://avatars.githubusercontent.com/u/63504321?v=4" width="100px;" alt=""/><br /><sub><b>Lucky-Ya-Q</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=Lucky-Ya-Q" title="Code">πŸ’»</a></td>
216-
<td align="center"><a href="https://github.com/xGuangsPBD"><img src="https://avatars.githubusercontent.com/u/41880611?v=4" width="100px;" alt=""/><br /><sub><b>xGuangsPBD</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=xGuangsPBD" title="Code">πŸ’»</a></td>
217-
<td align="center"><a href="https://github.com/cnvoid"><img src="https://avatars.githubusercontent.com/u/17289381?v=4" width="100px;" alt=""/><br /><sub><b>cnvoid</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=cnvoid" title="Code">πŸ’»</a></td>
218216
</tr>
219217
<tr>
218+
<td align="center"><a href="https://github.com/xGuangsPBD"><img src="https://avatars.githubusercontent.com/u/41880611?v=4" width="100px;" alt=""/><br /><sub><b>xGuangsPBD</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=xGuangsPBD" title="Code">πŸ’»</a></td>
219+
<td align="center"><a href="https://github.com/cnvoid"><img src="https://avatars.githubusercontent.com/u/17289381?v=4" width="100px;" alt=""/><br /><sub><b>cnvoid</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=cnvoid" title="Code">πŸ’»</a></td>
220220
<td align="center"><a href="https://github.com/sakanaovo"><img src="https://avatars.githubusercontent.com/u/86860377?v=4" width="100px;" alt=""/><br /><sub><b>sakanaovo</b></sub></a><br /><a href="https://github.com/DevCloudFE/vue-devui/commits?author=sakanaovo" title="Code">πŸ’»</a></td>
221221
</tr>
222222
</tbody>

0 commit comments

Comments
Β (0)