!179 liteos_a仓中.gitignore文件对打patch生成的冲突文件做了不必要的屏蔽

Merge pull request !179 from boxi/master
2021-04-22 17:22:18 +08:00 · 2021-04-22 17:22:18 +08:00 · 6085048a95
parent dc90400456 35f7957975
commit 6085048a95
1 changed files with 0 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,8 +3,6 @@
 *.a
 *.so
 *.swp
-*.rej
-*.orig

 # IDE settings
 .vscode