Closed mrdrogdrog closed 3 years ago
It doesn't really matter because all branches are modifing the same file and have the same origin commit. So there will always be conflicts to solve.
all branches are modifing the same file and have the same origin commit. So there will always be conflicts to solve.
Yes, I am sorry that you had to go through all this trouble. It will be made better as part of #344.
This PR adds the logo of IPFS
Fixes #286