Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
Signed-off-by: Zone.N <[email protected]>
  • Loading branch information
MRNIU committed Nov 24, 2021
2 parents 0e83a3e + f6d3bd7 commit c8428b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ cmake-build-debug
cmake-build-debug_simplekernel
grub-2.04.tar.xz
grub-2.04
tools/opensbi
iso
*.img
*.iso
*.bin
null.d
tools/opensbi/
tools/opensbi/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ Free to PR!
## 捐助者

- [digmouse233](https://github.com/digmouse233)

- l*e
- fslongjin

## 版权信息

Expand Down
2 changes: 1 addition & 1 deletion README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ Free to PR!
## Donors

- [digmouse233](https://github.com/digmouse233)

- l*e
- fslongjin

## CopyRight

Expand Down

0 comments on commit c8428b1

Please sign in to comment.