增加linux-arm64.deb产物 - #4
Closed
jiangchuanso wants to merge 12 commits into
Closed
jiangchuanso wants to merge 12 commits into
jiangchuanso wants to merge 12 commits into
Conversation
# Conflicts: # test/frontend.js
Owner
|
解决一下代码冲突吧 |
上游 45 个提交（70ca762..ae95568）。唯一冲突 test/tenant.js：两侧各自修了同一处（造账数据加序号，免得毫秒撞车把两笔真账当成一笔），代码逐字相同、只有注释不同，取两侧注释合并；上游把断言收紧成两页 100 条一条不重复。fork 独有改动全部保留（release.yml 的 deb 腿、electron-builder 的 linux 段、package.json 的 dist:linux、.dockerignore/.gitignore、发版文档、README、e2e 的 Linux 产物闸门、frontend 的海盐主题钉住）。
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
增加linux-arm64.deb产物