diff --git a/README.md b/README.md index 6e5ccd36..e8d8c390 100644 --- a/README.md +++ b/README.md @@ -1675,6 +1675,7 @@ See [go-hardware](https://github.com/rakyll/go-hardware) for a comprehensive lis * [drone-scp](https://github.com/appleboy/drone-scp) - Copy files and artifacts via SSH using a binary, docker or Drone CI. * [Dropship](https://github.com/chrismckenzie/dropship) - Tool for deploying code via cdn. * [easyssh-proxy](https://github.com/appleboy/easyssh-proxy) - Golang package for easy remote execution through SSH and SCP downloading via `ProxyCommand`. +* [fac](https://github.com/mkchoi212/fac) - Command-line user interface to fix git merge conflicts * [Gitea](https://github.com/go-gitea/gitea) - Fork of Gogs, entirely community driven. * [Go Metrics](https://github.com/rcrowley/go-metrics) - Go port of Coda Hale's Metrics library: https://github.com/codahale/metrics. * [go-selfupdate](https://github.com/sanbornm/go-selfupdate) - Enable your Go applications to self update.