search

GovReady / govready

Toolkit for getting open source apps ready for secure, approved government use
GNU General Public License v3.0
97 stars 31 forks source link

Clean up conflicting merges #89

Closed openprivacy closed 8 years ago

openprivacy commented 8 years ago

This should clean up the conflicts, though I haven't fully tested yet. I've also re-added the README.md changes that describe the updates (somehow missed in earlier merges...)

openprivacy commented 8 years ago

Just ran a test run - looks good.

gregelin commented 8 years ago

Thanks for updating.