Merge conflict lines committed into source

Election-Tech-Initiative / electionguard-c

This repository implements the ElectionGuard API using C. It includes all major functions of the ElectionGuard SDK, including key ceremony, ballot encryption, encrypted ballot tally, and partial decryptions for knowledge proofs of trustees.

MIT License

52 stars 57 forks source link

Merge conflict lines committed into source #1

Closed mdavis777 closed 5 years ago

mdavis777 commented 5 years ago

Commit 0b30d4044d69606925f1e748517f0ca410cc0f44 added merge commit lines in examples/simple/CMakeLists.txt and src/electionguard/sha2-openbsd.h

supr commented 5 years ago

https://github.com/microsoft/ElectionGuard-SDK-C-Implementation/compare/master...supr:fix_build?expand=1 incase some one needs it