From 1685d37c010423ebf6e67eb17fbbc36eb57c0463 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Tue, 11 Jul 2017 23:20:51 -0500
Subject: [PATCH] Fix typo

---
 tailbone/templates/master/merge.mako | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tailbone/templates/master/merge.mako b/tailbone/templates/master/merge.mako
index d56416d7..d5e47ac9 100644
--- a/tailbone/templates/master/merge.mako
+++ b/tailbone/templates/master/merge.mako
@@ -97,7 +97,7 @@
 <p class="warning">
   <strong>Unless you know what you're doing, a good rule of thumb (though still no
   guarantee) is to merge <em>only</em> if the "resulting" column is all-white.</strong>&nbsp;
-  (You may be able to swap kept/removed in order to achive this.)
+  (You may be able to swap kept/removed in order to achieve this.)
 </p>
 
 <p>