Skip to content
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
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

Patch 2 #125

wants to merge 38 commits into from

Conversation

BlackPeter13
Copy link

No description provided.

Noritte and others added 30 commits January 21, 2021 21:24
…-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`
fixed boost-1.69.0.zip again
Fixed mv boost-1.69.0 boost in windows
@lucoski88
Copy link

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants