Resolving conflict when merging documentation

README.md

docs/Automate_Poignée_de_Main_WS2P.pdf

docs/DUBP.pdf

docs/Duniter_API_HTTP_-_Catalogue_-Résumé.pdf

docs/Duniter_Network_Protocol__WebSocket_to_Peer.pdf

docs/IPs.md

docs/blockchain_processing.pdf

docs/protocole_conventions.md

handshake/.gitignore

lib/block/blocks_fetcher.ex

lib/bma/blockchain/block.ex

lib/bma/blockchain/blocks.ex

lib/bma/blockchain/branches.ex

lib/bma/blockchain/current.ex

lib/bma/blockchain/difficulties.ex

lib/bma/blockchain/hardship.ex

lib/bma/blockchain/memberships.ex

lib/bma/blockchain/parameters.ex

lib/bma/blockchain/with/actives.ex

lib/bma/blockchain/with/certs.ex