From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 7 May 2014 17:54:44 +0000 (-0400)
Subject: fix merge conflict
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1763de425306f92cc6cb93c185b303b73ddae533;p=ardour-manual

fix merge conflict
---

diff --git a/_manual/16_automation.html b/_manual/16_automation.html
index cf4674a..e14a309 100644
--- a/_manual/16_automation.html
+++ b/_manual/16_automation.html
@@ -4,4 +4,3 @@ title: Automation
 ---                        
 
 {% children %}
-