Language/Style updates - Githubissues

super3 / peercoin_website_old

Deprecated.

http://peercoin.net

MIT License

7 stars 46 forks source link

Closed xeroc closed 10 years ago

xeroc commented 10 years ago

index.php:

changed link to funding addresses ... please give some hint on the validity of those addresses
Installing and setting up "the" Wallet
More resources
social networks

super3 commented 10 years ago

Can't automerge.

xeroc commented 10 years ago

Whats the issue with merging? Did i made a mistake somewhere?

super3 commented 10 years ago

Something was pulled into the repository after this commit was made, and something conflicts. I don't know what it is.

xeroc commented 10 years ago

Ok ... So i fixed the commit

It's been due to the removing of *.php in the urls

Hope it works for you now!

super3 commented 10 years ago

please squash or create a new pull req

xeroc commented 10 years ago

Please close this pull request .. latest pulls changed too much for that to be squashed

super3 commented 10 years ago

Please open new pull req.