Fix lingering git merge messages in upgrade docs.
authorChris Sharp <csharp@georgialibraries.org>
Sat, 8 Sep 2018 13:37:12 +0000 (09:37 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Sat, 8 Sep 2018 13:37:12 +0000 (09:37 -0400)
commitbba8065f1271e6a319ca7e3be5ca0993557673b0
tree18da044738c8bde675a053b0f9654f22e0e1702e
parentbf2013d1a0648daf6075067584fe08b3da93578c
Fix lingering git merge messages in upgrade docs.
docs/installation/server_upgrade.adoc