浏览代码

Build App list and docs

GitHub Workflow 2 年之前
父节点
当前提交
dab3141daf
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      docs/AppList.md

+ 0 - 4
docs/AppList.md

@@ -4,11 +4,7 @@ List of all apps included in this project with info related to it.
 
 |**Arm32:**          |**Arm64:**|**Amd64:**|**Total:**|
 |:-------------------|:--------:|:--------:|:--------:|
-<<<<<<< HEAD
 | 168 apps | 182 apps | 180 apps | 182 apps |
-=======
-| 167 apps | 181 apps | 179 apps | 181 apps |
->>>>>>> 78620ea341f1fea94143e830dd5ffc7a8ab9f37f
 
 ---