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>
Fri, 19 Oct 2018 11:56:21 +0000 (07:56 -0400)
commitb2046ce998bc958ed045c1ef6c140487d3185a9e
tree3051a111d622adda1eeb9651f5d8f2cf81d84d9f
parentcb7112a94babae1e99062b4a4c02ff62609c46f7
Fix lingering git merge messages in upgrade docs.
docs/installation/server_upgrade.adoc