-
Notifications
You must be signed in to change notification settings - Fork 222
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Patch 2 #125
Open
BlackPeter13
wants to merge
38
commits into
bcndev:master
Choose a base branch
from
BlackPeter13:patch-2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Patch 2 #125
Conversation
This file contains 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
…-RPC-API.md This commit need to resolve conflicts here: username1565#2
…JSON-RPC-API.md This commit need to resolve conflicts here: username1565#2
This changes need to resolve conflicts in PR username1565#2 Change LF to CRLF, '\n' -> to '\r\n', because armornetworkdev have \r\n, as end of line, here: https://github.com/armornetworkdev/armor/blob/master/src/CryptoNoteConfig.hpp and this file is conflicts with previous file, after opened Pull Request.
Update "master"-branch from "armornetworkdev"'s repositary
Update azure-pipelines.yml for Azure Pipelines `armornetworkdev/master`
more seed nodes
updated link boost
fixed boost-1.69.0.zip
fixed boost-1.69.0.zip again
Fixed mv boost-1.69.0 boost in windows
boost-boost-1.69.0
Update README.md
v0.03-azure-pipeline
v0.03-azure-pipeline
…line Armor v0.0.3-azure-pipeline
Change '\t' to two space, because else this not working, after copy and paste.
Hi, can you explain what is this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.